mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-19 00:01:23 +00:00
pad: Don't unlock while iterating over all sticky events for removal
Otherwise we might end up getting the event removed from elsewhere at the same time while we're unlocked for g_object_notify(). https://bugzilla.gnome.org/show_bug.cgi?id=732556
This commit is contained in:
parent
b5936efc98
commit
d0a808cdc8
1 changed files with 13 additions and 7 deletions
20
gst/gstpad.c
20
gst/gstpad.c
|
@ -399,6 +399,7 @@ remove_events (GstPad * pad)
|
|||
{
|
||||
guint i, len;
|
||||
GArray *events;
|
||||
gboolean notify = FALSE;
|
||||
|
||||
events = pad->priv->events;
|
||||
|
||||
|
@ -409,19 +410,24 @@ remove_events (GstPad * pad)
|
|||
|
||||
ev->event = NULL;
|
||||
|
||||
if (event && GST_EVENT_TYPE (event) == GST_EVENT_CAPS) {
|
||||
GST_OBJECT_UNLOCK (pad);
|
||||
if (event && GST_EVENT_TYPE (event) == GST_EVENT_CAPS)
|
||||
notify = TRUE;
|
||||
|
||||
GST_DEBUG_OBJECT (pad, "notify caps");
|
||||
g_object_notify_by_pspec ((GObject *) pad, pspec_caps);
|
||||
|
||||
GST_OBJECT_LOCK (pad);
|
||||
}
|
||||
gst_event_unref (event);
|
||||
}
|
||||
|
||||
GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PENDING_EVENTS);
|
||||
g_array_set_size (events, 0);
|
||||
pad->priv->events_cookie++;
|
||||
|
||||
if (notify) {
|
||||
GST_OBJECT_UNLOCK (pad);
|
||||
|
||||
GST_DEBUG_OBJECT (pad, "notify caps");
|
||||
g_object_notify_by_pspec ((GObject *) pad, pspec_caps);
|
||||
|
||||
GST_OBJECT_LOCK (pad);
|
||||
}
|
||||
}
|
||||
|
||||
/* should be called with object lock */
|
||||
|
|
Loading…
Reference in a new issue