From 3bdc745bd15f5742c41f560c5f7c397bc5ca8a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Sat, 6 Dec 2025 14:05:06 +0100 Subject: [PATCH] Fix use-after-free when mobj is removed while still playing sounds --- src/p_setup.c | 2 ++ src/s_sound.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/p_setup.c b/src/p_setup.c index b7b8f03d5..2993bb5d2 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -812,6 +812,8 @@ static void P_LoadSectors(UINT8 *data) ss->tag = SHORT(ms->tag); ss->flags |= SF_FLIPSPECIAL_FLOOR; + + ss->soundorg.thinker.function = (actionf_p1)P_MobjThinker; } // set the sky flat num diff --git a/src/s_sound.c b/src/s_sound.c index 5bc830252..651d579b8 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -772,9 +772,14 @@ void S_UpdateSounds(void) volume = c->volume; // 8 bits internal volume precision sep = NORM_SEP; + if (P_MobjWasRemoved(c->origin)) + { + // origin was removed, stop the music + S_StopChannel(cnum); + } // check non-local sounds for distance clipping // or modify their params - if (c->origin) + else { boolean itsUs = false;