From eb4e6b5c87e89c4cf47e3ccc14b90876eab525f9 Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 3 Jan 2023 20:20:22 +0000 Subject: [PATCH] Remove heinous pointer-sent-over-the-network hack remnants This used to be used for `P_RelinkPointers()`, but was superseded by the far saner mobjnum. HOWEVER, its lingering effect was to leave `mobj->info` in an invalid state until a later `P_FinishMobjs()` was called. This is memory unsafety :D After removing the last remnants of this ancient hack, it is now once again possible to connect to a server without crashing immediately. However, I did get a crash after a few seconds, so there is definitely still *something* nasty going on under the hood. --- src/p_saveg.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/src/p_saveg.c b/src/p_saveg.c index 570e8e1f0..756c413b1 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -1203,7 +1203,7 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8 if (diff & MD_MORE) WRITEUINT16(save->p, diff2); - // save pointer, at load time we will search this pointer to reinitilize pointers + // keep here for vanilla compat WRITEUINT32(save->p, (size_t)mobj); WRITEFIXED(save->p, mobj->z); // Force this so 3dfloor problems don't arise. @@ -1982,7 +1982,6 @@ static void CalculateDoomednumToMobjtype(void) static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) { - thinker_t *next; mobj_t *mobj; UINT32 diff; UINT16 diff2; @@ -1995,7 +1994,8 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) else diff2 = 0; - next = (void *)(size_t)READUINT32(save->p); + // here for vanilla compat + save->p += sizeof(UINT32); z = READFIXED(save->p); // Force this so 3dfloor problems don't arise. floorz = READFIXED(save->p); @@ -2234,8 +2234,6 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) if (diff2 & MD2_WAYPOINTCAP) P_SetTarget(&waypointcap, mobj); - mobj->info = (mobjinfo_t *)next; // temporarily, set when leave this function - R_AddMobjInterpolator(mobj); } @@ -3200,25 +3198,6 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePolyObjects(savebuffer_t *save) for (i = 0; i < numSavedPolys; ++i) P_UnArchivePolyObj(save, &PolyObjects[i]); } -// -// P_FinishMobjs -// -FUNCINLINE static ATTRINLINE void P_FinishMobjs(void) -{ - thinker_t *currentthinker; - mobj_t *mobj; - - // put info field there real value - for (currentthinker = thinkercap.next; currentthinker != &thinkercap; - currentthinker = currentthinker->next) - { - if (currentthinker->function != (actionf_p1)P_MobjThinker) - continue; - - mobj = (mobj_t *)currentthinker; - mobj->info = &mobjinfo[mobj->type]; - } -} FUNCINLINE static ATTRINLINE mobj_t *RelinkMobj(mobj_t **ptr) { @@ -3807,7 +3786,6 @@ boolean P_LoadNetGame(savebuffer_t *save, boolean reloading) P_NetUnArchiveThinkers(save); P_NetUnArchiveSpecials(save); P_RelinkPointers(); - P_FinishMobjs(); } LUA_UnArchive(save, true);