zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-20 06:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed bad assumption about object destruction state in garbage collector.

Browse source 
The assumption was made that every object in the ToDestroy list wasn't destroyed yet.
This assumption is wrong in case one object destroys an owned one on its own destruction.
Instead this case must be properly dealt with and duplicate destruction be avoided.

This happened with the panel sprite sentinel in SW's player object.
This commit is contained in:
Christoph Oelckers 2023-10-03 12:23:29 +02:00
parent a8f2af7257
commit b10f50bf1d
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/common/objects/dobjgc.cpp
View file

@ -287,11 +287,22 @@ static size_t DestroyObjects(size_t count)
while ((curr = ToDestroy) != nullptr && count-- > 0)
{
assert(!(curr->ObjectFlags & OF_EuthanizeMe));
bytes_destroyed += curr->GetClass()->Size + GCDESTROYCOST;
ToDestroy = curr->GCNext;
curr->GCNext = nullptr;
curr->Destroy();
// Note that we cannot assume here that the object has not yet been destroyed.
// If destruction happens as the result of another object's destruction we may
// get entries here that have been destroyed already if that owning object was
// first in the list.
if (!(curr->ObjectFlags & OF_EuthanizeMe))
{
bytes_destroyed += curr->GetClass()->Size + GCDESTROYCOST;
ToDestroy = curr->GCNext;
curr->GCNext = nullptr;
curr->Destroy();
}
else
{
ToDestroy = curr->GCNext;
curr->GCNext = nullptr;
}
}
return bytes_destroyed;
}