mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:36:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp: Don't use invalid sockets

Browse source 
return false from dispatch () if the read and write sockets have been
unset in tunnel_complete ()

Setting up HTTP tunnels causes segfaults since the watch for the second
connection is not destroyed anymore in tunnel_complete () and the connection
will still be used even though it is not valid anymore.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=686276
This commit is contained in:
Ognyan Tonchev 2012-10-25 09:19:21 +02:00 committed by Wim Taymans
parent 883dc41848
commit 6e5ea441e7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/rtsp/gstrtspconnection.c
View file

@ -2971,8 +2971,13 @@ gst_rtsp_source_dispatch (GSource * source, GSourceFunc callback G_GNUC_UNUSED,
/* in the callback the connection should be tunneled with the /* in the callback the connection should be tunneled with the
* GET connection */ * GET connection */
if (watch->funcs.tunnel_complete) if (watch->funcs.tunnel_complete) {
watch->funcs.tunnel_complete (watch, watch->user_data); watch->funcs.tunnel_complete (watch, watch->user_data);
keep_running = !(watch->conn->read_socket == NULL &&
watch->conn->write_socket == NULL);
if (!keep_running)
goto done;
}
goto read_done; goto read_done;
} }
} }
@ -3056,6 +3061,7 @@ gst_rtsp_source_dispatch (GSource * source, GSourceFunc callback G_GNUC_UNUSED,
g_mutex_unlock (&watch->mutex); g_mutex_unlock (&watch->mutex);
} }
done:
write_blocked: write_blocked:
return keep_running; return keep_running;