mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 12:15:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-stream: fix deadlock on transport removal

Browse source 
We cannot take the RTSPStream lock while holding a transport backlog
lock, as remove_transport may be called externally, which will
take first the RTSPStream lock then the transport backlog lock.
This commit is contained in:
Mathieu Duponchelle 2020-02-14 14:59:43 +01:00 committed by Mathieu Duponchelle
parent fa41cbe9a4
commit 8410c69da9
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/rtsp-server/rtsp-stream.c
View file

@ -2516,11 +2516,10 @@ done:
}
/* Must be called *without* priv->lock */
static void
static gboolean
push_data (GstRTSPStream * stream, GstRTSPStreamTransport * trans,
GstBuffer * buffer, GstBufferList * buffer_list, gboolean is_rtp)
{
GstRTSPStreamPrivate *priv = stream->priv;
gboolean send_ret = TRUE;
if (is_rtp) {
@ -2535,12 +2534,7 @@ push_data (GstRTSPStream * stream, GstRTSPStreamTransport * trans,
send_ret = gst_rtsp_stream_transport_send_rtcp_list (trans, buffer_list);
}
if (!send_ret) {
/* remove transport on send error */
g_mutex_lock (&priv->lock);
update_transport (stream, trans, FALSE);
g_mutex_unlock (&priv->lock);
}
return send_ret;
}
/* With priv->lock */
@ -2572,6 +2566,9 @@ ensure_cached_transports (GstRTSPStream * stream)
static void
check_transport_backlog (GstRTSPStream * stream, GstRTSPStreamTransport * trans)
{
GstRTSPStreamPrivate *priv = stream->priv;
gboolean send_ret = TRUE;
gst_rtsp_stream_transport_lock_backlog (trans);
if (!gst_rtsp_stream_transport_backlog_is_empty (trans)) {
@ -2586,13 +2583,20 @@ check_transport_backlog (GstRTSPStream * stream, GstRTSPStreamTransport * trans)
g_assert (popped == TRUE);
push_data (stream, trans, buffer, buffer_list, is_rtp);
send_ret = push_data (stream, trans, buffer, buffer_list, is_rtp);
gst_clear_buffer (&buffer);
gst_clear_buffer_list (&buffer_list);
}
gst_rtsp_stream_transport_unlock_backlog (trans);
if (!send_ret) {
/* remove transport on send error */
g_mutex_lock (&priv->lock);
update_transport (stream, trans, FALSE);
g_mutex_unlock (&priv->lock);
}
}
/* Must be called with priv->lock */