mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

multiqueue: fix potential crash on shutdown

Browse source 
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 <nazard@nazar.ca>
Co-authored-by: Sebastian Dröge <sebastian@centricular.com>
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2599>
This commit is contained in:
Tim-Philipp Müller 2022-06-14 17:29:31 +01:00 committed by GStreamer Marge Bot
parent 64833d2f12
commit e72434ba20
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gstreamer/plugins/elements/gstmultiqueue.c
View file

@ -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)