gstreamer: bin: Don't unlock unlocked mutex in gst_bin_remove_func()
authormedithe <medithe@gmx.at>
Tue, 7 Feb 2023 13:43:06 +0000 (13:43 +0000)
committerTim-Philipp Müller <tim@centricular.com>
Tue, 7 Feb 2023 17:54:30 +0000 (17:54 +0000)
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/3910>

subprojects/gstreamer/gst/gstbin.c

index 19b0fa6..d9b2b7c 100644 (file)
@@ -1567,8 +1567,10 @@ gst_bin_remove_func (GstBin * bin, GstElement * element)
   GST_OBJECT_LOCK (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;
+  }
 
   /* remove the parent ref */
   GST_OBJECT_PARENT (element) = NULL;
@@ -1819,7 +1821,6 @@ no_state_recalc:
   /* ERROR handling */
 not_in_bin:
   {
-    GST_OBJECT_UNLOCK (element);
     GST_OBJECT_UNLOCK (bin);
     GST_WARNING_OBJECT (bin, "Element '%s' is not in bin", elem_name);
     g_free (elem_name);