zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-02-22 19:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added a sanity check to GL nodes loader for a potential crash.

Browse source
This commit is contained in:
Christoph Oelckers 2015-04-17 19:40:45 +02:00
parent d166211ce0
commit 6e28963141
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/p_glnodes.cpp
View file

@ -338,7 +338,14 @@ static bool LoadGLSegs(FileReader * lump)
ml->side=LittleShort(ml->side); ml->side=LittleShort(ml->side);
segs[i].sidedef = ldef->sidedef[ml->side]; segs[i].sidedef = ldef->sidedef[ml->side];
if (ldef->sidedef[ml->side] != NULL)
{
segs[i].frontsector = ldef->sidedef[ml->side]->sector; segs[i].frontsector = ldef->sidedef[ml->side]->sector;
}
else
{
segs[i].frontsector = NULL;
}
if (ldef->flags & ML_TWOSIDED && ldef->sidedef[ml->side^1] != NULL) if (ldef->flags & ML_TWOSIDED && ldef->sidedef[ml->side^1] != NULL)
{ {
segs[i].backsector = ldef->sidedef[ml->side^1]->sector; segs[i].backsector = ldef->sidedef[ml->side^1]->sector;
@ -346,7 +353,7 @@ static bool LoadGLSegs(FileReader * lump)
else else
{ {
ldef->flags &= ~ML_TWOSIDED; ldef->flags &= ~ML_TWOSIDED;
segs[i].backsector = 0; segs[i].backsector = NULL;
} }
} }
@ -385,7 +392,14 @@ static bool LoadGLSegs(FileReader * lump)
ml->side=LittleShort(ml->side); ml->side=LittleShort(ml->side);
segs[i].sidedef = ldef->sidedef[ml->side]; segs[i].sidedef = ldef->sidedef[ml->side];
if (ldef->sidedef[ml->side] != NULL)
{
segs[i].frontsector = ldef->sidedef[ml->side]->sector; segs[i].frontsector = ldef->sidedef[ml->side]->sector;
}
else
{
segs[i].frontsector = NULL;
}
if (ldef->flags & ML_TWOSIDED && ldef->sidedef[ml->side^1] != NULL) if (ldef->flags & ML_TWOSIDED && ldef->sidedef[ml->side^1] != NULL)
{ {
segs[i].backsector = ldef->sidedef[ml->side^1]->sector; segs[i].backsector = ldef->sidedef[ml->side^1]->sector;
@ -393,7 +407,7 @@ static bool LoadGLSegs(FileReader * lump)
else else
{ {
ldef->flags &= ~ML_TWOSIDED; ldef->flags &= ~ML_TWOSIDED;
segs[i].backsector = 0; segs[i].backsector = NULL;
} }
} }