Skip to content

Fix potential crash when sticky bomb target is invalid #194

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
+14 −0
Open

Fix potential crash when sticky bomb target is invalid #194

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
7 changes: 7 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,13 @@ UpdateSleepTime StickyBombUpdate::update( void )
//-------------------------------------------------------------------------------------------------
Object* StickyBombUpdate::getTargetObject() const
{
// Validate the target ID before attempting to find the object
// This prevents crashes when the target has been destroyed but m_targetID still holds the old ID
if( m_targetID == INVALID_ID )
{
return NULL;
}

return TheGameLogic->findObjectByID( m_targetID );
}

Expand Down
7 changes: 7 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,13 @@ UpdateSleepTime StickyBombUpdate::update( void )
//-------------------------------------------------------------------------------------------------
Object* StickyBombUpdate::getTargetObject() const
{
// Validate the target ID before attempting to find the object
// This prevents crashes when the target has been destroyed but m_targetID still holds the old ID
if( m_targetID == INVALID_ID )
{
return NULL;
}

return TheGameLogic->findObjectByID( m_targetID );
}

Expand Down
Loading