mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-01 17:53:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

queue2: fix deadlock in error path

Browse source 
Don't lock the same lock twice. Spotted by Josep Torre Valles.
This commit is contained in:
Tim-Philipp Müller 2011-08-12 19:27:21 +01:00
parent 63fb18dcd9
commit a7644b3b1c
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/elements/gstqueue2.c
View file

@ -2835,17 +2835,15 @@ gst_queue2_src_activate_pull (GstPad * pad, gboolean active)
queue->is_eos = FALSE; queue->is_eos = FALSE;
queue->unexpected = FALSE; queue->unexpected = FALSE;
queue->upstream_size = 0; queue->upstream_size = 0;
GST_QUEUE2_MUTEX_UNLOCK (queue);
} else { } else {
GST_QUEUE2_MUTEX_LOCK (queue);
GST_DEBUG_OBJECT (queue, "no temp file, cannot activate pull mode"); GST_DEBUG_OBJECT (queue, "no temp file, cannot activate pull mode");
/* this is not allowed, we cannot operate in pull mode without a temp /* this is not allowed, we cannot operate in pull mode without a temp
* file. */ * file. */
queue->srcresult = GST_FLOW_WRONG_STATE; queue->srcresult = GST_FLOW_WRONG_STATE;
queue->sinkresult = GST_FLOW_WRONG_STATE; queue->sinkresult = GST_FLOW_WRONG_STATE;
result = FALSE; result = FALSE;
GST_QUEUE2_MUTEX_UNLOCK (queue);
} }
GST_QUEUE2_MUTEX_UNLOCK (queue);
} else { } else {
GST_QUEUE2_MUTEX_LOCK (queue); GST_QUEUE2_MUTEX_LOCK (queue);
GST_DEBUG_OBJECT (queue, "deactivating pull mode"); GST_DEBUG_OBJECT (queue, "deactivating pull mode");