[pulseaudio-commits] r2399 - /branches/coling/airtunes/src/modules/rtp/rtsp_client.c

[svnmailer-noreply at 0pointer.de]

Author: coling
Date: Sun May 11 15:32:09 2008
New Revision: 2399

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2399&root=pulseaudio&view=rev
Log:
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.

Modified:
    branches/coling/airtunes/src/modules/rtp/rtsp_client.c

Modified: branches/coling/airtunes/src/modules/rtp/rtsp_client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/coling/airtunes/src/modules/rtp/rtsp_client.c?rev=2399&root=pulseaudio&r1=2398&r2=2399&view=diff
==============================================================================
--- branches/coling/airtunes/src/modules/rtp/rtsp_client.c (original)
+++ branches/coling/airtunes/src/modules/rtp/rtsp_client.c Sun May 11 15:32:09 2008
@@ -224,7 +224,14 @@
     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 */