Skip to content

bugfix(gameengine): Prevent crash when OCL source object is null or destroyed #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugfix(gameengine): Prevent crash when OCL source object is null or destroyed #437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,16 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
if( m_containInsideSourceObject )
{
// The Obj has been totally made, so stuff it inside ourselves if desired.
if( sourceObj->getContain() && sourceObj->getContain()->isValidContainerFor(obj, TRUE))
// Guard against sourceObj being null or already destroyed (e.g. when this OCL fires
// from a CreateObjectDie handler -- the dying object may be in the process of being
// deleted, making the pointer dangling/invalid).
if( !sourceObj || sourceObj->isDestroyed() )
{
DEBUG_CRASH(("A OCL with ContainInsideSourceObject has a null or already-destroyed sourceObj and is killing the new object."));
// If the source object is gone, we can't contain the new object. Stillborn it.
TheGameLogic->destroyObject(obj);
}
else if( sourceObj->getContain() && sourceObj->getContain()->isValidContainerFor(obj, TRUE))
{
sourceObj->getContain()->addToContain( obj );

Expand Down
Loading