mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-25 01:10:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

input-selector: Take the object lock while iterating sinkpads

Browse source 
Otherwise we can race with pad removal and crash from use-after-free.

Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1717
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3745>
This commit is contained in:
Jan Alexander Steffens (heftig) 2023-01-18 16:07:39 +01:00 committed by GStreamer Marge Bot
parent 81b726344e
commit b0e55caf0d
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subprojects/gstreamer/plugins/elements/gstinputselector.c
View file

@ -506,18 +506,21 @@ static gboolean
gst_input_selector_all_eos (GstInputSelector * sel)
{
GList *walk;
gboolean ret = TRUE;
GST_OBJECT_LOCK (sel);
for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk; walk = walk->next) {
GstSelectorPad *selpad;
selpad = GST_SELECTOR_PAD_CAST (walk->data);
if (!selpad->eos) {
return FALSE;
ret = FALSE;
break;
}
}
GST_OBJECT_UNLOCK (sel);
return TRUE;
return ret;
}
static gboolean
@ -900,6 +903,7 @@ gst_input_selector_debug_cached_buffers (GstInputSelector * sel)
if (gst_debug_category_get_threshold (input_selector_debug) < GST_LEVEL_DEBUG)
return;
GST_OBJECT_LOCK (sel);
for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk; walk = walk->next) {
GstSelectorPad *selpad;
GString *timestamps;
@ -921,6 +925,7 @@ gst_input_selector_debug_cached_buffers (GstInputSelector * sel)
GST_DEBUG_OBJECT (selpad, "%s", timestamps->str);
g_string_free (timestamps, TRUE);
}
GST_OBJECT_UNLOCK (sel);
}
#endif
@ -967,6 +972,8 @@ gst_input_selector_cleanup_old_cached_buffers (GstInputSelector * sel,
return;
GST_DEBUG_OBJECT (sel, "Cleaning up old cached buffers");
GST_OBJECT_LOCK (sel);
for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk; walk = g_list_next (walk)) {
GstSelectorPad *selpad;
GstSelectorPadCachedBuffer *cached_buffer;
@ -1030,6 +1037,7 @@ gst_input_selector_cleanup_old_cached_buffers (GstInputSelector * sel,
selpad->cached_buffers = NULL;
}
}
GST_OBJECT_UNLOCK (sel);
#if DEBUG_CACHED_BUFFERS
gst_input_selector_debug_cached_buffers (sel);
@ -1979,6 +1987,7 @@ gst_input_selector_reset (GstInputSelector * sel)
sel->eos_sent = FALSE;
/* reset each of our sinkpads state */
GST_OBJECT_LOCK (sel);
for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk; walk = g_list_next (walk)) {
GstSelectorPad *selpad = GST_SELECTOR_PAD_CAST (walk->data);
@ -1989,6 +1998,8 @@ gst_input_selector_reset (GstInputSelector * sel)
selpad->tags = NULL;
}
}
GST_OBJECT_UNLOCK (sel);
sel->have_group_id = TRUE;
sel->upstream_latency = 0;
sel->last_output_ts = GST_CLOCK_TIME_NONE;