mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

sctp: Fix race of pad removal during reset/stop

Browse source 
Both reset & stop remove existing pads. Can result in warning from
gst_element_remove_pad().

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2256>
This commit is contained in:
Doug Nazar 2021-05-17 09:13:28 -04:00 committed by GStreamer Marge Bot
parent 4fcfd5b7f9
commit 5663db236f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/sctp/gstsctpdec.c
View file

@ -606,8 +606,11 @@ static void
remove_pad (GstSctpDec * self, GstPad * pad) remove_pad (GstSctpDec * self, GstPad * pad)
{ {
stop_srcpad_task (pad); stop_srcpad_task (pad);
GST_PAD_STREAM_LOCK (pad);
gst_pad_set_active (pad, FALSE); gst_pad_set_active (pad, FALSE);
gst_element_remove_pad (GST_ELEMENT (self), pad); if (gst_object_has_as_parent (GST_OBJECT (pad), GST_OBJECT (self)))
gst_element_remove_pad (GST_ELEMENT (self), pad);
GST_PAD_STREAM_UNLOCK (pad);
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
gst_flow_combiner_remove_pad (self->flow_combiner, pad); gst_flow_combiner_remove_pad (self->flow_combiner, pad);
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);