zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 06:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix null pointer access in p_terrain.cpp

Browse source
This commit is contained in:
Marrub 2018-11-23 17:46:34 -05:00 committed by Christoph Oelckers
parent ee91cf77e4
commit 2e2fe87445
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/p_terrain.cpp
View file

@ -556,17 +556,17 @@ static void GenericParse (FScanner &sc, FGenericParse *parser, const char **keyw
else else
{ {
info = PClass::FindClass (sc.String); info = PClass::FindClass (sc.String);
if (!info->IsDescendantOf (RUNTIME_CLASS(AActor))) if (info == NULL)
{
Printf ("Unknown actor %s in %s %s\n",
sc.String, type, name.GetChars());
}
else if (!info->IsDescendantOf (RUNTIME_CLASS(AActor)))
{ {
Printf ("%s is not an Actor (in %s %s)\n", Printf ("%s is not an Actor (in %s %s)\n",
sc.String, type, name.GetChars()); sc.String, type, name.GetChars());
info = NULL; info = NULL;
} }
else if (info == NULL)
{
Printf ("Unknown actor %s in %s %s\n",
sc.String, type, name.GetChars());
}
} }
SET_FIELD (const PClass *, info); SET_FIELD (const PClass *, info);
break; break;