[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-99-g21ab720

[Lennart Poettering]

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 master branch has been updated
      from  86caf4520fe3ffb899110711ff0d8a8b8122368e (commit)

- Log -----------------------------------------------------------------
21ab720 http: fix segfault on connection termination
-----------------------------------------------------------------------

Summary of changes:
 src/pulsecore/protocol-http.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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

commit 21ab720dd1d7373264e40d160c7ac9bcfe614ae7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 12 17:08:34 2009 +0200

    http: fix segfault on connection termination

diff --git a/src/pulsecore/protocol-http.c b/src/pulsecore/protocol-http.c
index b5d7530..5220cc9 100644
--- a/src/pulsecore/protocol-http.c
+++ b/src/pulsecore/protocol-http.c
@@ -111,6 +111,7 @@ static void connection_unlink(struct connection *c) {
 
     if (c->source_output) {
         pa_source_output_unlink(c->source_output);
+        c->source_output->userdata = NULL;
         pa_source_output_unref(c->source_output);
     }
 
@@ -190,7 +191,9 @@ static int source_output_process_msg(pa_msgobject *m, int code, void *userdata,
     struct connection *c;
 
     pa_source_output_assert_ref(o);
-    pa_assert_se(c = o->userdata);
+
+    if (!(c = o->userdata))
+        return -1;
 
     switch (code) {
 

-- 
hooks/post-receive
PulseAudio Sound Server