mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-21 05:26:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-client: Only unref client watch context on finalize, to avoid deadlock

Browse source 
Fixes https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/issues/127

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/176>
This commit is contained in:
Lawrence Troup 2020-12-14 14:12:38 +13:00
parent 5b08a6042d
commit 6bf45b5965
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/rtsp-server/rtsp-client.c
View file

@ -765,9 +765,13 @@ gst_rtsp_client_finalize (GObject * obj)
/* the watch and related state should be cleared before finalize
* as the watch actually holds a strong reference to the client */
g_assert (priv->watch == NULL);
g_assert (priv->watch_context == NULL);
g_assert (priv->rtsp_ctrl_timeout == NULL);
if (priv->watch_context) {
g_main_context_unref (priv->watch_context);
priv->watch_context = NULL;
}
gst_rtsp_client_set_send_func (client, NULL, NULL, NULL);
gst_rtsp_client_set_send_messages_func (client, NULL, NULL, NULL);
@ -1308,11 +1312,6 @@ gst_rtsp_client_close (GstRTSPClient * client)
rtsp_ctrl_timeout_remove (client);
}
if (priv->watch_context) {
g_main_context_unref (priv->watch_context);
priv->watch_context = NULL;
}
g_mutex_unlock (&priv->watch_lock);
}
@ -5071,11 +5070,6 @@ handle_tunnel (GstRTSPClient * client)
rtsp_ctrl_timeout_remove (client);
}
if (priv->watch_context) {
g_main_context_unref (priv->watch_context);
priv->watch_context = NULL;
}
return GST_RTSP_STS_OK;
/* ERRORS */
@ -5174,10 +5168,6 @@ client_watch_notify (GstRTSPClient * client)
gst_rtsp_client_set_send_messages_func (client, NULL, NULL, NULL);
rtsp_ctrl_timeout_remove (client);
gst_rtsp_client_session_filter (client, cleanup_session, &closed);
if (priv->watch_context) {
g_main_context_unref (priv->watch_context);
priv->watch_context = NULL;
}
if (closed)
g_signal_emit (client, gst_rtsp_client_signals[SIGNAL_CLOSED], 0, NULL);
@ -5210,6 +5200,7 @@ gst_rtsp_client_attach (GstRTSPClient * client, GMainContext * context)
priv = client->priv;
g_return_val_if_fail (priv->connection != NULL, 0);
g_return_val_if_fail (priv->watch == NULL, 0);
g_return_val_if_fail (priv->watch_context == NULL, 0);
/* make sure noone will free the context before the watch is destroyed */
priv->watch_context = g_main_context_ref (context);