mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-06 01:19:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-rtsp-server: fix race in rtsp-client

Browse source 
When tunneling over HTTP, if connection on the second channel happens
before the control timer is created we may trigger an assert in
rtsp_ctrl_timeout_remove(). Avoid that by taking the priv->lock before
attaching the client thread to the context.

Fixes #1025

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1870>
This commit is contained in:
Branko Subasic 2022-03-07 09:14:46 +01:00 committed by Tim-Philipp Müller
parent 2aa8ef4173
commit 341e55e9f2
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client.c
View file

@ -5304,12 +5304,15 @@ gst_rtsp_client_attach (GstRTSPClient * client, GMainContext * context)
gst_rtsp_watch_set_send_backlog (priv->watch, 0, WATCH_BACKLOG_SIZE);
/* take the lock before attaching the client watch, so that the client thread
* can not access the control channel timer until it's properly in place */
g_mutex_lock (&priv->lock);
GST_INFO ("client %p: attaching to context %p", client, context);
res = gst_rtsp_watch_attach (priv->watch, context);
/* Setting up a timeout for the RTSP control channel until a session
* is up where it is handling timeouts. */
g_mutex_lock (&priv->lock);
/* remove old timeout if any */
rtsp_ctrl_timeout_remove_unlocked (client->priv);