zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-22 03:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- validate partner seg index in LoadGLZSegs before using it

Browse source 
KDiZD Z1M10 has something bogus in there, this case will now trigger a node rebuild.
This commit is contained in:
Christoph Oelckers 2023-09-16 09:48:43 +02:00
parent 81e42142af
commit ea51c92fda
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/maploader/maploader.cpp
View file

@ -426,7 +426,7 @@ void MapLoader::LoadVertexes(MapData * map)
if (numvertexes == 0) if (numvertexes == 0)
{ {
I_Error("Map has no vertices.\n"); I_Error("Map has no vertices.");
} }
// Allocate memory for buffer. // Allocate memory for buffer.
@ -497,6 +497,11 @@ void MapLoader::LoadGLZSegs (FileReader &data, int type)
uint32_t partner = data.ReadUInt32(); uint32_t partner = data.ReadUInt32();
uint32_t line; uint32_t line;
if (partner != 0xffffffffu && partner >= Level->segs.Size())
{
I_Error("partner seg index out of range for subsector %d, seg %d", i, j);
}
if (type >= 2) if (type >= 2)
{ {
line = data.ReadUInt32(); line = data.ReadUInt32();
@ -563,7 +568,7 @@ void MapLoader::LoadZNodes(FileReader &data, int glnodes)
if (orgVerts > Level->vertexes.Size()) if (orgVerts > Level->vertexes.Size())
{ // These nodes are based on a map with more vertex data than we have. { // These nodes are based on a map with more vertex data than we have.
// We can't use them. // We can't use them.
throw CRecoverableError("Incorrect number of vertexes in nodes.\n"); I_Error("Incorrect number of vertexes in nodes.");
} }
auto oldvertexes = &Level->vertexes[0]; auto oldvertexes = &Level->vertexes[0];
if (orgVerts + newVerts != Level->vertexes.Size()) if (orgVerts + newVerts != Level->vertexes.Size())
@ -606,7 +611,7 @@ void MapLoader::LoadZNodes(FileReader &data, int glnodes)
// segs used by subsectors. // segs used by subsectors.
if (numSegs != currSeg) if (numSegs != currSeg)
{ {
throw CRecoverableError("Incorrect number of segs in nodes.\n"); I_Error("Incorrect number of segs in nodes.");
} }
Level->segs.Alloc(numSegs); Level->segs.Alloc(numSegs);
@ -758,6 +763,7 @@ bool MapLoader::LoadExtendedNodes (FileReader &dalump, uint32_t id)
Printf("Error loading nodes: %s\n", error.what()); Printf("Error loading nodes: %s\n", error.what());
} }
// clean up. // clean up.
Printf("The BSP will be rebuilt\n");
ForceNodeBuild = true; ForceNodeBuild = true;
Level->subsectors.Clear(); Level->subsectors.Clear();
Level->segs.Clear(); Level->segs.Clear();
@ -1654,7 +1660,7 @@ void MapLoader::FinishLoadingLineDefs ()
} }
else else
{ {
I_Error ("%d sidedefs is not enough\n", sidecount); I_Error ("%d sidedefs is not enough", sidecount);
} }
} }
@ -2695,7 +2701,7 @@ void MapLoader::GroupLines (bool buildmap)
} }
if (flaggedNoFronts) if (flaggedNoFronts)
{ {
I_Error ("You need to fix these lines to play this map.\n"); I_Error ("You need to fix these lines to play this map.");
} }
// build line tables for each sector // build line tables for each sector
@ -3086,8 +3092,8 @@ void MapLoader::LoadLevel(MapData *map, const char *lumpname, int position)
} }
} }
// If loading the regular nodes failed try GL nodes before considering a rebuild // If loading the regular nodes failed try GL nodes before considering a rebuild (unless a rebuild was already asked for)
if (!NodesLoaded) if (!NodesLoaded && !ForceNodeBuild)
{ {
if (LoadGLNodes(map)) if (LoadGLNodes(map))
reloop = true; reloop = true;