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
This commit is contained in:
Colin Guthrie 2008-05-11 13:32:09 +00:00
parent d51f5944b7
commit 4dd318519f

View file

@ -224,7 +224,14 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
pa_rtsp_client *c = userdata; pa_rtsp_client *c = userdata;
pa_assert(line); pa_assert(line);
pa_assert(c); 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); s2 = pa_xstrdup(s);
/* Trim trailing carriage returns */ /* Trim trailing carriage returns */