Fix use-after-frees around mobjs

# Conflicts:
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_mobj.c
#	src/p_saveg.c
#	src/p_tick.c
This commit is contained in:
X.organic 2022-09-03 02:58:47 +00:00 committed by Eidolon
parent 371ae2fe12
commit b03ef98753
2 changed files with 2 additions and 1 deletions

View file

@ -11240,6 +11240,7 @@ void P_RemoveSavegameMobj(mobj_t *mobj)
// free block // free block
P_RemoveThinker((thinker_t *)mobj); P_RemoveThinker((thinker_t *)mobj);
R_RemoveMobjInterpolator(mobj);
} }
static CV_PossibleValue_t respawnitemtime_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}}; static CV_PossibleValue_t respawnitemtime_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}};

View file

@ -725,7 +725,7 @@ void R_RemoveMobjInterpolator(mobj_t *mobj)
if (interpolated_mobjs_len == 0) return; if (interpolated_mobjs_len == 0) return;
for (i = 0; i < interpolated_mobjs_len - 1; i++) for (i = 0; i < interpolated_mobjs_len; i++)
{ {
if (interpolated_mobjs[i] == mobj) if (interpolated_mobjs[i] == mobj)
{ {