Skip to content

bugfix(contain): Prevent undefined behaviour when a dead unit enters a container #2258

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

Merged
xezon merged 6 commits into from
Feb 12, 2026
Merged

bugfix(contain): Prevent undefined behaviour when a dead unit enters a container #2258

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3cc536
bugfix: Prevent undefined behaviour when a dead unit enters a container
Stubbjax Feb 5, 2026
919e73d
bugfix: Fix crate cargo not being contained due to having no ActiveBody
Stubbjax Feb 8, 2026
fda1f98
tweak: Adjust fix to check destroyed status instead of dead status
Stubbjax Feb 10, 2026
f0dfc9d
tweak: Apply fix in retail-compatible path
Stubbjax Feb 10, 2026
7309626
tweak: Entering destroyed containers is already safe
Stubbjax Feb 10, 2026
08c87ab
docs: Update comments
Stubbjax Feb 10, 2026
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
8 changes: 7 additions & 1 deletion 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 @@ -273,10 +273,16 @@ void OpenContain::addOrRemoveObjFromWorld(Object* obj, Bool add)
//-------------------------------------------------------------------------------------------------
void OpenContain::addToContain( Object *rider )
{

#if RETAIL_COMPATIBLE_CRC
Comment thread
Caball009 marked this conversation as resolved.
Outdated
Comment thread
Caball009 marked this conversation as resolved.
Outdated
// sanity
if( rider == nullptr )
return;
#else
// TheSuperHackers @bugfix Stubbjax 06/02/2026 Always ensure interacting objects are alive.
// This prevents undefined behaviour if a unit dies and enters a container on the same frame.
Comment thread
Caball009 marked this conversation as resolved.
Outdated
if (rider == nullptr || (rider->isEffectivelyDead() && !rider->getBodyModule()->isIndestructible()) || getObject()->isEffectivelyDead())
return;
#endif
Comment thread
Caball009 marked this conversation as resolved.
Outdated

#if defined(RTS_DEBUG)
if( !isValidContainerFor( rider, false ) )
Expand Down
9 changes: 9 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 @@ -280,6 +280,7 @@ void OpenContain::addOrRemoveObjFromWorld(Object* obj, Bool add)
//-------------------------------------------------------------------------------------------------
void OpenContain::addToContain( Object *rider )
{
#if RETAIL_COMPATIBLE_CRC
if( getObject()->checkAndDetonateBoobyTrap(rider) )
{
// Whoops, I was mined. Cancel if I (or they) am now dead.
Expand All @@ -292,6 +293,14 @@ void OpenContain::addToContain( Object *rider )
// sanity
if( rider == nullptr )
Comment thread
Caball009 marked this conversation as resolved.
return;
#else
getObject()->checkAndDetonateBoobyTrap(rider);

Comment thread
Caball009 marked this conversation as resolved.
// TheSuperHackers @bugfix Stubbjax 06/02/2026 Always ensure interacting objects are alive.
// This prevents undefined behaviour if a unit dies and enters a container on the same frame.
if (rider == nullptr || (rider->isEffectivelyDead() && !rider->getBodyModule()->isIndestructible()) || getObject()->isEffectivelyDead())
return;
Comment thread
Caball009 marked this conversation as resolved.
#endif

Drawable *riderDraw = rider->getDrawable();
Bool wasSelected = FALSE;
Expand Down
Loading