From 3e89057c23908d798a68f99448cab1bc726371a2 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 14 Feb 2024 21:39:20 +0100 Subject: [PATCH] Fix dangling pointer in mapthing after removing mobj --- src/p_mobj.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index fe226b054..9d8d85aff 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10365,6 +10365,12 @@ void P_RemoveMobj(mobj_t *mobj) P_SetTarget(&mobj->hprev, NULL); } } + + // clear the reference from the mapthing + if (mobj->spawnpoint) + mobj->spawnpoint->mobj = NULL; + + R_RemoveMobjInterpolator(mobj); // free block // DBG: set everything in mobj_t to 0xFF instead of leaving it. debug memory error. @@ -10397,8 +10403,6 @@ void P_RemoveMobj(mobj_t *mobj) #endif P_RemoveThinker((thinker_t *)mobj); } - - R_RemoveMobjInterpolator(mobj); } // This does not need to be added to Lua.