Skip to content

fix: Guard BodyModule access in StealthUpdate::allowedToStealth #566

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: Guard BodyModule access in StealthUpdate::allowedToStealth #566

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
8 changes: 5 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,15 +310,17 @@ Bool StealthUpdate::allowedToStealth( Object *stealthOwner ) const
return FALSE;
}

if( flags & STEALTH_NOT_WHILE_TAKING_DAMAGE && self->getBodyModule()->getLastDamageTimestamp() >= now - 1 )
BodyModuleInterface *body = self->getBodyModule();
if( flags & STEALTH_NOT_WHILE_TAKING_DAMAGE && body && body->getLastDamageTimestamp() >= now - 1 )
{
#if RETAIL_COMPATIBLE_CRC || PRESERVE_STRUCTURE_STEALTH_DURING_REPAIR
//Only if it's not healing damage.
if( self->getBodyModule()->getLastDamageInfo()->in.m_damageType != DAMAGE_HEALING )
const DamageInfo *lastDamageInfo = body->getLastDamageInfo();
if( lastDamageInfo && lastDamageInfo->in.m_damageType != DAMAGE_HEALING )
#endif
{
//Can't stealth if we just took damage in the last frame or two.
if( self->getBodyModule()->getLastDamageTimestamp() != 0xffffffff )
if( body->getLastDamageTimestamp() != 0xffffffff )
{
//But it's initialized to 0xffffffff so we don't think we took damage on the first frame.
return FALSE;
Expand Down
Loading