summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2013-08-16 16:45:41 +0100
committerTim-Philipp Müller <tim@centricular.net>2013-08-16 16:53:29 +0100
commit6b4bef214b48a52366c5382cc052fb3f70754b8a (patch)
treedf3f487216ef5ccfb32d3141cb2f92b741dbb1a1 /plugins
parentc02081ca30631824c116ef1057c1bd9054c70507 (diff)
queue2: don't crash on EOS if queue is empty
Fixes spurious crash in test_simple_shutdown_while_running unit test.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/elements/gstqueue2.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index 43a0d4ff5..2ed547518 100644
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -2072,6 +2072,10 @@ gst_queue2_locked_dequeue (GstQueue2 * queue, GstQueue2ItemType * item_type)
item = gst_queue2_read_item_from_file (queue);
} else {
GstQueue2Item *qitem = g_queue_pop_head (&queue->queue);
+
+ if (qitem == NULL)
+ goto no_item;
+
item = qitem->item;
g_slice_free (GstQueue2Item, qitem);
}