mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstreamer: bin: Don't unlock unlocked mutex in gst_bin_remove_func()

Browse source 
Calling `g_mutex_unlock(mutex)` leads to an undefined behavior if the
mutex is not locked by the current thread.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3903>
This commit is contained in:
medithe 2023-02-07 13:43:06 +00:00 committed by Sebastian Dröge
parent d10f9a00e2
commit 3943503fc1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subprojects/gstreamer/gst/gstbin.c
View file

@ -1567,8 +1567,10 @@ gst_bin_remove_func (GstBin * bin, GstElement * element)
GST_OBJECT_LOCK (element); GST_OBJECT_LOCK (element);
elem_name = g_strdup (GST_ELEMENT_NAME (element)); elem_name = g_strdup (GST_ELEMENT_NAME (element));
if (GST_OBJECT_PARENT (element) != GST_OBJECT_CAST (bin)) if (GST_OBJECT_PARENT (element) != GST_OBJECT_CAST (bin)) {
GST_OBJECT_UNLOCK (element);
goto not_in_bin; goto not_in_bin;
}
/* remove the parent ref */ /* remove the parent ref */
GST_OBJECT_PARENT (element) = NULL; GST_OBJECT_PARENT (element) = NULL;
@ -1819,7 +1821,6 @@ no_state_recalc:
/* ERROR handling */ /* ERROR handling */
not_in_bin: not_in_bin:
{ {
GST_OBJECT_UNLOCK (element);
GST_OBJECT_UNLOCK (bin); GST_OBJECT_UNLOCK (bin);
GST_WARNING_OBJECT (bin, "Element '%s' is not in bin", elem_name); GST_WARNING_OBJECT (bin, "Element '%s' is not in bin", elem_name);
g_free (elem_name); g_free (elem_name);