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

basesrc: protect segment_seqnum/pending with object lock

Browse source 
In a few places the object lock was not taken when writing to
segment_pending and segment_seqnum.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6671>
This commit is contained in:
Johan Sternerup 2024-04-18 11:09:46 +02:00 committed by GStreamer Marge Bot
parent a3f8f036fe
commit deddcbdc66
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gstreamer/libs/gst/base/gstbasesrc.c
View file

@ -1844,8 +1844,10 @@ gst_base_src_perform_seek (GstBaseSrc * src, GstEvent * event, gboolean unlock)
gst_element_post_message (GST_ELEMENT (src), message); gst_element_post_message (GST_ELEMENT (src), message);
} }
GST_OBJECT_LOCK (src);
src->priv->segment_pending = TRUE; src->priv->segment_pending = TRUE;
src->priv->segment_seqnum = seqnum; src->priv->segment_seqnum = seqnum;
GST_OBJECT_UNLOCK (src);
} }
src->priv->discont = TRUE; src->priv->discont = TRUE;
@ -1905,9 +1907,9 @@ gst_base_src_send_event (GstElement * element, GstEvent * event)
/* For external flush, restart the task .. */ /* For external flush, restart the task .. */
GST_LIVE_LOCK (src); GST_LIVE_LOCK (src);
src->priv->segment_pending = TRUE;
GST_OBJECT_LOCK (src->srcpad); GST_OBJECT_LOCK (src->srcpad);
src->priv->segment_pending = TRUE;
start = (GST_PAD_MODE (src->srcpad) == GST_PAD_MODE_PUSH); start = (GST_PAD_MODE (src->srcpad) == GST_PAD_MODE_PUSH);
GST_OBJECT_UNLOCK (src->srcpad); GST_OBJECT_UNLOCK (src->srcpad);
@ -2977,9 +2979,11 @@ gst_base_src_loop (GstPad * pad)
/* generate the event but do not send until outside of live_lock */ /* generate the event but do not send until outside of live_lock */
seg_event = gst_event_new_segment (&src->segment); seg_event = gst_event_new_segment (&src->segment);
GST_OBJECT_LOCK (src);
gst_event_set_seqnum (seg_event, src->priv->segment_seqnum); gst_event_set_seqnum (seg_event, src->priv->segment_seqnum);
src->priv->segment_seqnum = gst_util_seqnum_next (); src->priv->segment_seqnum = gst_util_seqnum_next ();
src->priv->segment_pending = FALSE; src->priv->segment_pending = FALSE;
GST_OBJECT_UNLOCK (src);
} }
/* collect any pending events */ /* collect any pending events */