mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-18 05:50:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

parsebin: Add missing locks/unlocks of the chain mutex

Browse source 
Before freeing pending pads it is required to hold the mutex, that's
what is protecting the list of pending pads in other places.

https://bugzilla.gnome.org/show_bug.cgi?id=796935
This commit is contained in:
Sebastian Dröge 2018-08-08 17:35:08 +02:00
parent 33e92afd91
commit 596a4ee12f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/playback/gstparsebin.c
View file

@ -3469,14 +3469,16 @@ retry:
/* Get the pads that we're going to expose and mark things as exposed */
uncollected_streams = FALSE;
CHAIN_MUTEX_LOCK (parsebin->parse_chain);
if (!gst_parse_chain_expose (parsebin->parse_chain, &endpads, &missing_plugin,
missing_plugin_details, &last_group, &uncollected_streams)) {
g_list_free_full (endpads, (GDestroyNotify) gst_object_unref);
g_string_free (missing_plugin_details, TRUE);
GST_ERROR_OBJECT (parsebin, "Broken chain/group tree");
g_return_val_if_reached (FALSE);
CHAIN_MUTEX_UNLOCK (parsebin->parse_chain);
return FALSE;
}
CHAIN_MUTEX_UNLOCK (parsebin->parse_chain);
if (endpads == NULL) {
if (missing_plugin) {
if (missing_plugin_details->len > 0) {
@ -3726,8 +3728,10 @@ gst_parse_chain_expose (GstParseChain * chain, GList ** endpads,
for (l = group->children; l; l = l->next) {
GstParseChain *childchain = l->data;
CHAIN_MUTEX_LOCK (childchain);
ret |= gst_parse_chain_expose (childchain, endpads, missing_plugin,
missing_plugin_details, last_group, uncollected_streams);
CHAIN_MUTEX_UNLOCK (childchain);
}
return ret;