zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-20 18:42:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: When deserializing the object list, the array must be nulled before using it so that a premature abort does not end up working on random data.

Browse source 
(cherry picked from commit ad343892f3)
This commit is contained in:
Christoph Oelckers 2018-05-29 19:00:41 +02:00 committed by drfrag666
parent c656185069
commit 24d0aee2e7
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/serializer.cpp
View file

@ -996,6 +996,11 @@ void FSerializer::ReadObjects(bool hubtravel)
{
DThinker::bSerialOverride = true;
r->mDObjects.Resize(ArraySize());
for (auto &p : r->mDObjects)
{
p = nullptr;
}
// First iteration: create all the objects but do nothing with them yet.
for (unsigned i = 0; i < r->mDObjects.Size(); i++)
{
@ -1067,7 +1072,7 @@ void FSerializer::ReadObjects(bool hubtravel)
// nuke all objects we created here.
for (auto obj : r->mDObjects)
{
if (!(obj->ObjectFlags & OF_EuthanizeMe)) obj->Destroy();
if (obj != nullptr && !(obj->ObjectFlags & OF_EuthanizeMe)) obj->Destroy();
}
r->mDObjects.Clear();