Skip to content

Fix crash during game shutdown when repositioning objects #299

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

Fix crash during game shutdown when repositioning objects #299

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,12 @@ void OpenContain::monitorConditionChanges( void )
void OpenContain::redeployOccupants( void )
{

// TheSuperHackers @fix xezon 09/06/2025 Prevent repositioning objects during game shutdown.
// During shutdown, objects may be in the process of being destroyed, which can lead to
// use-after-free crashes if we attempt to reposition them.
if( TheGameLogic == nullptr || !TheGameLogic->isInGame() )
return;

//
// because the state has changed, we will must give the deploy logic the opportunity
// to look for a new set of bones in the art ... so if we had them flagged as not
Expand Down Expand Up @@ -1121,6 +1127,12 @@ void OpenContain::redeployOccupants( void )
void OpenContain::putObjAtNextFirePoint( Object *obj )
{

// TheSuperHackers @fix xezon 09/06/2025 Prevent repositioning objects during game shutdown.
// During shutdown, objects may be in the process of being destroyed, which can lead to
// use-after-free crashes if we attempt to reposition them.
if( TheGameLogic == nullptr || !TheGameLogic->isInGame() )
return;

//
// first, if we need to load the 3D point data from the art do so, if we've already
// determined there is no firepoints in the current art we will avoid searching for
Expand Down
12 changes: 12 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,12 @@ void OpenContain::monitorConditionChanges( void )
void OpenContain::redeployOccupants( void )
{

// TheSuperHackers @fix xezon 09/06/2025 Prevent repositioning objects during game shutdown.
// During shutdown, objects may be in the process of being destroyed, which can lead to
// use-after-free crashes if we attempt to reposition them.
if( TheGameLogic == nullptr || !TheGameLogic->isInGame() )
return;

//
// because the state has changed, we will must give the deploy logic the opportunity
// to look for a new set of bones in the art ... so if we had them flagged as not
Expand Down Expand Up @@ -1243,6 +1249,12 @@ void OpenContain::redeployOccupants( void )
void OpenContain::putObjAtNextFirePoint( Object *obj )
{

// TheSuperHackers @fix xezon 09/06/2025 Prevent repositioning objects during game shutdown.
// During shutdown, objects may be in the process of being destroyed, which can lead to
// use-after-free crashes if we attempt to reposition them.
if( TheGameLogic == nullptr || !TheGameLogic->isInGame() )
return;

//
// first, if we need to load the 3D point data from the art do so, if we've already
// determined there is no firepoints in the current art we will avoid searching for
Expand Down
Loading