mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 01:32:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

stream: release lock even not all transports have been removed

Browse source 
We don't want to keep the lock even we return FALSE because not all the
transports have been removed. This could lead into a deadlock.

https://bugzilla.gnome.org/show_bug.cgi?id=737797
This commit is contained in:
Aleix Conchillo Flaqué 2014-10-02 12:02:48 -07:00 committed by Wim Taymans
parent dde6a89928
commit 966065a018
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1962,7 +1962,8 @@ gst_rtsp_stream_leave_bin (GstRTSPStream * stream, GstBin * bin,
goto was_not_joined;
/* all transports must be removed by now */
g_return_val_if_fail (priv->transports == NULL, FALSE);
if (priv->transports != NULL)
goto transports_not_removed;
clear_tr_cache (priv);
@ -2072,6 +2073,12 @@ was_not_joined:
g_mutex_unlock (&priv->lock);
return TRUE;
}
transports_not_removed:
{
GST_ERROR_OBJECT (stream, "can't leave bin (transports not removed)");
g_mutex_unlock (&priv->lock);
return FALSE;
}
}
/**