[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, stable-queue, updated. v0.9.21-65-ge756467

[Colin Guthrie]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The stable-queue branch has been updated
      from  29845be64dc1470060388c2fb32223ff42af8d25 (commit)

- Log -----------------------------------------------------------------
e756467 Fix crash on jack server shutdown
-----------------------------------------------------------------------

Summary of changes:
 src/modules/jack/module-jack-sink.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------

commit e756467434f787d392c45aac1327768bcf0b610c
Author: David Henningsson <diwic at ubuntu.com>
Date:   Sun Mar 14 20:20:12 2010 +0100

    Fix crash on jack server shutdown
    
    On sink unlinking, existing sink inputs are moved, which in turn calls
    a get latency callback, which references the jack client. Therefore,
    make sure the sink is unlinked before the client is closed. Failure to
    do so might lead to SIGSEGV.

diff --git a/src/modules/jack/module-jack-sink.c b/src/modules/jack/module-jack-sink.c
index 9f3e071..e4467d3 100644
--- a/src/modules/jack/module-jack-sink.c
+++ b/src/modules/jack/module-jack-sink.c
@@ -475,12 +475,12 @@ void pa__done(pa_module*m) {
     if (!(u = m->userdata))
         return;
 
-    if (u->client)
-        jack_client_close(u->client);
-
     if (u->sink)
         pa_sink_unlink(u->sink);
 
+    if (u->client)
+        jack_client_close(u->client);
+
     if (u->thread) {
         pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
         pa_thread_free(u->thread);

-- 
hooks/post-receive
PulseAudio Sound Server