port P_VerifyBlockMap from dsda-doom
to check for blockmap issues that might cause crashes
This commit is contained in:
1 parent
d8e8d8106a
commit
97f9c2fb68
1 file changed
+82
@@ -1628,6 +1628,80 @@ static void P_CreateBlockMap(void)
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// P_VerifyBlockMap
|
||||
//
|
||||
// haleyjd 03/04/10: do verification on validity of blockmap.
|
||||
//
|
||||
static boolean P_VerifyBlockMap(INT32 count)
|
||||
{
|
||||
// FIXME: should any of this shit be unsinged?
|
||||
INT32 x, y;
|
||||
INT32 *maxoffs = blockmaplump + count;
|
||||
|
||||
//skipblstart = true;
|
||||
|
||||
for (y = 0; y < bmapheight; y++)
|
||||
{
|
||||
for (x = 0; x < bmapwidth; x++)
|
||||
{
|
||||
INT32 offset;
|
||||
INT32 *list, *tmplist;
|
||||
INT32 *blockoffset;
|
||||
|
||||
offset = y * bmapwidth + x;
|
||||
blockoffset = blockmaplump + offset + 4;
|
||||
|
||||
// check that block offset is in bounds
|
||||
if (blockoffset >= maxoffs)
|
||||
{
|
||||
CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: block offset overflow\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
offset = *blockoffset;
|
||||
|
||||
// check that list offset is in bounds
|
||||
if (offset < 4 || offset >= count)
|
||||
{
|
||||
CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: list offset overflow\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
list = blockmaplump + offset;
|
||||
|
||||
//if (*list != 0)
|
||||
//skipblstart = false;
|
||||
|
||||
// scan forward for a -1 terminator before maxoffs
|
||||
for (tmplist = list; ; tmplist++)
|
||||
{
|
||||
// we have overflowed the lump?
|
||||
if (tmplist >= maxoffs)
|
||||
{
|
||||
CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: open blocklist\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (*tmplist == -1) // found -1
|
||||
break;
|
||||
}
|
||||
|
||||
// scan the list for out-of-range linedef indicies in list
|
||||
for (tmplist = list; *tmplist != -1; tmplist++)
|
||||
{
|
||||
if (*tmplist < 0 || *tmplist >= (INT32)numlines)
|
||||
{
|
||||
CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: index >= numlines\n");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// Split from P_LoadBlockMap for convenience
|
||||
// -- Monster Iestyn 08/01/18
|
||||
static void P_ReadBlockMapLump(INT16 *wadblockmaplump, size_t count)
|
||||
@@ -1672,6 +1746,14 @@ static boolean P_LoadRawBlockMap(UINT8 *data, size_t count)
|
||||
bmapwidth = blockmaplump[2];
|
||||
bmapheight = blockmaplump[3];
|
||||
|
||||
// haleyjd 03/04/10: check for blockmap problems
|
||||
// http://www.doomworld.com/idgames/index.php?id=12935
|
||||
if (!P_VerifyBlockMap(count))
|
||||
{
|
||||
CONS_Alert(CONS_ERROR, "P_LoadBlockMap: erroneous BLOCKMAP lump may cause crashes.\n");
|
||||
//CONS_Alert(CONS_NOTICE, "P_LoadBlockMap: use \"-blockmap\" command line switch for rebuilding\n");
|
||||
}
|
||||
|
||||
// clear out mobj chains
|
||||
count = sizeof (*blocklinks)* bmapwidth*bmapheight;
|
||||
blocklinks = Z_Calloc(count, PU_LEVEL, NULL);
|
||||
|
||||
Reference in new issue
Block a user