mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-26 07:56:38 +00:00
collectpads: Make sure that the object lock is always taken when accessing the private pad list
https://bugzilla.gnome.org/show_bug.cgi?id=708636
This commit is contained in:
parent
c79e5bbcad
commit
20f1c96c89
1 changed files with 3 additions and 1 deletions
|
@ -726,7 +726,7 @@ unknown_pad:
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Must be called with STREAM_LOCK.
|
* Must be called with STREAM_LOCK and OBJECT_LOCK.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
gst_collect_pads_set_flushing_unlocked (GstCollectPads * pads,
|
gst_collect_pads_set_flushing_unlocked (GstCollectPads * pads,
|
||||||
|
@ -778,7 +778,9 @@ gst_collect_pads_set_flushing (GstCollectPads * pads, gboolean flushing)
|
||||||
|
|
||||||
/* NOTE since this eventually calls _pop, some (STREAM_)LOCK is needed here */
|
/* NOTE since this eventually calls _pop, some (STREAM_)LOCK is needed here */
|
||||||
GST_COLLECT_PADS_STREAM_LOCK (pads);
|
GST_COLLECT_PADS_STREAM_LOCK (pads);
|
||||||
|
GST_OBJECT_LOCK (pads);
|
||||||
gst_collect_pads_set_flushing_unlocked (pads, flushing);
|
gst_collect_pads_set_flushing_unlocked (pads, flushing);
|
||||||
|
GST_OBJECT_UNLOCK (pads);
|
||||||
GST_COLLECT_PADS_STREAM_UNLOCK (pads);
|
GST_COLLECT_PADS_STREAM_UNLOCK (pads);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue