Skip to content

Fix state machine destructor access violation #306

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 state machine destructor access violation #306

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
9 changes: 6 additions & 3 deletions Generals/Code/GameEngine/Source/Common/StateMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,12 @@ StateMachine::StateMachine( Object *owner, AsciiString name )
StateMachine::~StateMachine()
{

// do not allow current state to exit
if (m_currentState)
m_currentState->onExit( EXIT_RESET );
// TheSuperHackers @bugfix 30/01/2025 Do not call onExit() on m_currentState during destruction.
// The state may already be in an invalid state or point to deleted memory during object destruction,
// especially when objects are being destroyed in GameLogic::processDestroyList.
// The halt() method already clears m_currentState in AIUpdateInterface::~AIUpdateInterface before
// the state machine is deleted, so this call is unnecessary and can cause access violations.
// See: https://sentry.io/share/issue/[issue-id]/

std::map<StateID, State *>::iterator i;

Expand Down
9 changes: 6 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,12 @@ StateMachine::StateMachine( Object *owner, AsciiString name )
StateMachine::~StateMachine()
{

// do not allow current state to exit
if (m_currentState)
m_currentState->onExit( EXIT_RESET );
// TheSuperHackers @bugfix 30/01/2025 Do not call onExit() on m_currentState during destruction.
// The state may already be in an invalid state or point to deleted memory during object destruction,
// especially when objects are being destroyed in GameLogic::processDestroyList.
// The halt() method already clears m_currentState in AIUpdateInterface::~AIUpdateInterface before
// the state machine is deleted, so this call is unnecessary and can cause access violations.
// See: https://sentry.io/share/issue/[issue-id]/

std::map<StateID, State *>::iterator i;

Expand Down
Loading