mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin: Protect ->source with the object lock

Browse source 
As expected by the property getter.

Basically there are cases where we can be getting the source from
any thread and in another thread bring back the element from PAUSED
to READY, which leads to a critical warning (or worse).

The only place where we use `->source` outside the property getter is
the change_state function so the current way of setting/reading it
should be safe.
This commit is contained in:
Thibault Saunier 2019-03-25 19:11:54 -03:00 committed by Thibault Saunier
parent e397c4cea1
commit 9e004b56fe
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/playback/gsturidecodebin.c
View file

@ -2076,8 +2076,10 @@ remove_source (GstURIDecodeBin * bin)
g_signal_handler_disconnect (source, bin->src_nmp_sig_id);
bin->src_nmp_sig_id = 0;
}
gst_bin_remove (GST_BIN_CAST (bin), source);
GST_OBJECT_LOCK (bin);
bin->source = NULL;
GST_OBJECT_UNLOCK (bin);
gst_bin_remove (GST_BIN_CAST (bin), source);
}
if (bin->queue) {
GST_DEBUG_OBJECT (bin, "removing old queue element");
@ -2180,6 +2182,7 @@ static gboolean
setup_source (GstURIDecodeBin * decoder)
{
gboolean is_raw, have_out, is_dynamic;
GstElement *source;
GST_DEBUG_OBJECT (decoder, "setup source");
@ -2189,8 +2192,14 @@ setup_source (GstURIDecodeBin * decoder)
decoder->pending = 0;
/* create and configure an element that can handle the uri */
if (!(decoder->source = gen_source_element (decoder)))
source = gen_source_element (decoder);
GST_OBJECT_LOCK (decoder);
if (!(decoder->source = source)) {
GST_OBJECT_UNLOCK (decoder);
goto no_source;
}
GST_OBJECT_UNLOCK (decoder);
/* state will be merged later - if file is not found, error will be
* handled by the application right after. */