summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-05-12 17:08:34 +0200
committerLennart Poettering <lennart@poettering.net>2009-05-12 17:08:34 +0200
commit21ab720dd1d7373264e40d160c7ac9bcfe614ae7 (patch)
tree6885573825a0ce813c325d9d2763e301e01b24af /src
parent86caf4520fe3ffb899110711ff0d8a8b8122368e (diff)
http: fix segfault on connection termination
Diffstat (limited to 'src')
-rw-r--r--src/pulsecore/protocol-http.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pulsecore/protocol-http.c b/src/pulsecore/protocol-http.c
index b5d75301..5220cc91 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) {