Merge lp:~diwic/ubuntu/lucid/pulseaudio/bugfixes into lp:ubuntu/lucid/pulseaudio

[David Henningsson]

LP: #538815

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.

[Daniel T Chen (crimsun)]

I've merged this locally, but LP is taking its sweet time handling the repo pack format upgrade to 2a.

review: Approve

Unmerged revisions

119. By David Henningsson on 2010-03-14

Fix SIGSEGV on jack server shutdown

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-10 18:53:51 +0000
+++ debian/changelog	2010-03-14 21:14:14 +0000
@@ -1,3 +1,9 @@
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu13) lucid; urgency=low
+
+  * Fix SIGSEGV on jack server shutdown (LP: #538815)
+
+ -- David Henningsson <[e-mail]>  Sun, 14 Mar 2010 22:03:00 +0100
+
 pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu12) lucid; urgency=low
 
   * debian/pulseaudio.init: Remove udev from Required-* LSB headers

=== added file 'debian/patches/0010-jack-server-shutdown.patch'
--- debian/patches/0010-jack-server-shutdown.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0010-jack-server-shutdown.patch	2010-03-14 21:14:14 +0000
@@ -0,0 +1,20 @@
+Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/jack/module-jack-sink.c
+===================================================================
+--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/jack/module-jack-sink.c	2010-03-14 19:55:41.344734134 +0100
++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/jack/module-jack-sink.c	2010-03-14 20:05:54.593480089 +0100
+@@ -475,12 +475,12 @@
+     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);

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-03-10 18:53:51 +0000
+++ debian/patches/series	2010-03-14 21:14:14 +0000
@@ -3,6 +3,7 @@
 #0005-load-sample-dir-lazy.patch
 0007-esd-honour-system-pulseaudio.patch
 #0090-use-volume-ignore-for-analog-output.patch
+0010-jack-server-shutdown.patch
 0054-mute-iec958-optical-raw-for-audigyX.patch
 0090-disable-flat-volumes.patch
 0091-dont-load-cork-music-on-phone.patch