mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

bin: Fix minor race when adding to a bin

Browse source 
This patch simply add a null check around a case where a child may have
been unparented concurrently to the deep_add_remove operation. This was
found by accident in the form of an "IS_GST_OBJECT" assertion, but had
no other known side effect in that test.
This commit is contained in:
Nicolas Dufresne 2019-09-03 13:44:24 -04:00
parent 83e0da2061
commit 80a76a4b4d
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gstbin.c
View file

@ -1122,6 +1122,9 @@ gst_bin_do_deep_add_remove (GstBin * bin, gint sig_id, const gchar * sig_name,
while ((e = g_queue_pop_head (&elements))) { while ((e = g_queue_pop_head (&elements))) {
GstObject *parent = gst_object_get_parent (GST_OBJECT_CAST (e)); GstObject *parent = gst_object_get_parent (GST_OBJECT_CAST (e));
/* an element could have removed some of its internal elements
* meanwhile, so protect against that */
if (parent) {
GST_LOG_OBJECT (bin, "calling %s for element %" GST_PTR_FORMAT GST_LOG_OBJECT (bin, "calling %s for element %" GST_PTR_FORMAT
" in bin %" GST_PTR_FORMAT, sig_name, e, parent); " in bin %" GST_PTR_FORMAT, sig_name, e, parent);
g_signal_emit (bin, sig_id, 0, parent, e); g_signal_emit (bin, sig_id, 0, parent, e);
@ -1129,6 +1132,7 @@ gst_bin_do_deep_add_remove (GstBin * bin, gint sig_id, const gchar * sig_name,
g_object_unref (e); g_object_unref (e);
} }
} }
}
gst_iterator_free (it); gst_iterator_free (it);
} }
} }