summaryrefslogtreecommitdiffstats
path: root/src/modules/rtp/rtsp_client.c
diff options
context:
space:
mode:
authorColin Guthrie <pulse@colin.guthr.ie>2008-05-11 13:32:09 +0000
committerColin Guthrie <pulse@colin.guthr.ie>2008-10-08 20:32:07 +0100
commit4dd318519fbec1811a16dca05aca859da74b60c2 (patch)
treef18f66f1c4d4001198e7e0b10a355dd68f5d75e8 /src/modules/rtp/rtsp_client.c
parentd51f5944b7248ec759ab71b0e811ec0f7c655e22 (diff)
Do not assert on NULL values of s. This means the connection was closed. This change somehow kills the mainloop with an assert, so I need to sort that out.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2399 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/rtp/rtsp_client.c')
-rw-r--r--src/modules/rtp/rtsp_client.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/modules/rtp/rtsp_client.c b/src/modules/rtp/rtsp_client.c
index c22f801e..5665c9f6 100644
--- a/src/modules/rtp/rtsp_client.c
+++ b/src/modules/rtp/rtsp_client.c
@@ -224,7 +224,14 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
pa_rtsp_client *c = userdata;
pa_assert(line);
pa_assert(c);
- pa_assert(s);
+
+ if (!s) {
+ pa_log_warn("Connection closed");
+ pa_ioline_unref(c->ioline);
+ c->ioline = NULL;
+ pa_rtsp_disconnect(c);
+ return;
+ }
s2 = pa_xstrdup(s);
/* Trim trailing carriage returns */