From 6b4bef214b48a52366c5382cc052fb3f70754b8a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 16 Aug 2013 16:45:41 +0100 Subject: [PATCH] queue2: don't crash on EOS if queue is empty Fixes spurious crash in test_simple_shutdown_while_running unit test. --- plugins/elements/gstqueue2.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c index 43a0d4f..2ed5475 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); } -- 2.7.4