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

add some sanity checks when loading flats from a savegame

Browse Source 
Fixes #469
This commit is contained in:
Fabian Greffrath 2022-03-03 08:13:52 +01:00
parent f5e9a193db
commit 175278a617
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/p_saveg.c
View File

@ -35,6 +35,7 @@
#include "m_random.h"
#include "am_map.h"
#include "p_enemy.h"
#include "w_wad.h" // [FG] W_LumpLength()
byte *save_p;
@ -2035,13 +2036,17 @@ void P_UnArchiveWorld (void)
// do sectors
for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
{
// [crispy] add overflow guard for the flattranslation[] array
short floorpic, ceilingpic;
extern int numflats;
// killough 10/98: load full floor & ceiling heights, including fractions
sec->floorheight = saveg_read32();
sec->ceilingheight = saveg_read32();
sec->floorpic = saveg_read16();
sec->ceilingpic = saveg_read16();
floorpic = saveg_read16();
ceilingpic = saveg_read16();
sec->lightlevel = saveg_read16();
sec->special = saveg_read16();
sec->tag = saveg_read16();
@ -2049,6 +2054,18 @@ void P_UnArchiveWorld (void)
sec->floordata = 0;
sec->lightingdata = 0;
sec->soundtarget = 0;
// [crispy] add overflow guard for the flattranslation[] array
if (floorpic >= 0 && floorpic < numflats &&
W_LumpLength(firstflat + floorpic) >= 64*64)
{
sec->floorpic = floorpic;
}
if (ceilingpic >= 0 && ceilingpic < numflats &&
W_LumpLength(firstflat + ceilingpic) >= 64*64)
{
sec->ceilingpic = ceilingpic;
}
}
// do lines