AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 11:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

pad the REJECT table when the lump is too small

Browse Source 
This reverts the previous commit which only handled the case of an
absent REJECT table. No attempts are made to simulate REJECT buffer
overflows in Vanilla Doom, because MBF is a different EXE anyway.
This commit is contained in:
Fabian Greffrath 2020-01-10 15:36:52 +01:00
parent 170b9f2a38
commit 00e17c0e1f
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Source/p_setup.c
View File

@ -936,6 +936,47 @@ void P_RemoveSlimeTrails(void) // killough 10/98
free(hit);
}
// [FG] pad the REJECT table when the lump is too small
static void P_LoadReject(int lumpnum)
{
int minlength;
int lumplen;
// Calculate the size that the REJECT lump *should* be.
minlength = (numsectors * numsectors + 7) / 8;
// If the lump meets the minimum length, it can be loaded directly.
// Otherwise, we need to allocate a buffer of the correct size
// and pad it with appropriate data.
lumplen = W_LumpLength(lumpnum);
if (lumplen >= minlength)
{
rejectmatrix = W_CacheLumpNum(lumpnum, PU_LEVEL);
}
else
{
unsigned int padvalue;
rejectmatrix = Z_Malloc(minlength, PU_LEVEL, (void **) &rejectmatrix);
W_ReadLump(lumpnum, rejectmatrix);
if (M_CheckParm("-reject_pad_with_ff"))
{
padvalue = 0xff;
}
else
{
padvalue = 0xf00;
}
memset(rejectmatrix + lumplen, padvalue, minlength - lumplen);
}
}
//
// P_SetupLevel
//
@ -992,7 +1033,8 @@ void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
P_LoadNodes (lumpnum+ML_NODES);
P_LoadSegs (lumpnum+ML_SEGS);
rejectmatrix = W_CacheLumpNum(lumpnum+ML_REJECT,PU_LEVEL);
// [FG] pad the REJECT table when the lump is too small
P_LoadReject (lumpnum+ML_REJECT);
P_GroupLines();
P_RemoveSlimeTrails(); // killough 10/98: remove slime trails from wad

4
Source/p_sight.c
View File

@ -224,12 +224,8 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2)
//
// Check in REJECT table.
// [FG] fix crash when loading maps without REJECT table
if (rejectmatrix)
{
if (rejectmatrix[pnum>>3] & (1 << (pnum&7))) // can't possibly be connected
return false;
}
// killough 4/19/98: make fake floors and ceilings block monster view
if ((s1->heightsec != -1 &&