From: Tim-Philipp Müller Date: Tue, 14 Jun 2022 16:29:31 +0000 (+0100) Subject: multiqueue: fix potential crash on shutdown X-Git-Tag: 1.22.0~1457 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e72434ba203aabbcd66247a13e0e2f263ef005dc;p=platform%2Fupstream%2Fgstreamer.git multiqueue: fix potential crash on shutdown The mq we get out of the weak ref might be NULL if we're shutting down, which could cause assertion failures or crashes. It might also cause miscompilations where the compiler just optimises away the NULL check because it jumps to a code path that then dereferences the pointer which clearly isn't going to work. Seems like something like this happens with gcc 11. Fixes #1262 Co-authored-by: Doug Nazar Co-authored-by: Sebastian Dröge Part-of: --- diff --git a/subprojects/gstreamer/plugins/elements/gstmultiqueue.c b/subprojects/gstreamer/plugins/elements/gstmultiqueue.c index a4bd1ed..10ad203 100644 --- a/subprojects/gstreamer/plugins/elements/gstmultiqueue.c +++ b/subprojects/gstreamer/plugins/elements/gstmultiqueue.c @@ -2129,7 +2129,7 @@ gst_multi_queue_loop (GstPad * pad) srcpad = g_weak_ref_get (&sq->srcpad); if (!mq || !srcpad) - goto out_flushing; + goto done; next: GST_DEBUG_OBJECT (mq, "SingleQueue %d : trying to pop an object", sq->id); @@ -2446,7 +2446,7 @@ gst_multi_queue_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) mq = g_weak_ref_get (&sq->mqueue); if (!mq) - goto flushing; + goto done; /* if eos, we are always full, so avoid hanging incoming indefinitely */ if (sq->is_eos)