Skip to content

GarrisonContain: Add safety checks to prevent crashes when structure or drawable are invalid #114

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
+37 −1
Open

GarrisonContain: Add safety checks to prevent crashes when structure or drawable are invalid #114

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
38 changes: 37 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1982,6 +1982,13 @@ void GarrisonContain::loadStationGarrisonPoints( void )
const GarrisonContainModuleData *modData = getGarrisonContainModuleData();

Object *structure = getObject();

// Safety check: ensure the structure object is still valid
if( structure == NULL )
{
return;
}

Bool stationBonesFound = FALSE;


Expand All @@ -1994,6 +2001,13 @@ void GarrisonContain::loadStationGarrisonPoints( void )

// save the original paramters for the model condition
Drawable* draw = structure->getDrawable();

// Safety check: ensure the drawable exists before accessing it
if( draw == NULL )
{
return;
}

const ModelConditionFlags originalFlags = draw->getModelConditionFlags();
ModelConditionFlags clearFlags;
ModelConditionFlags setFlags;
Expand All @@ -2006,15 +2020,33 @@ void GarrisonContain::loadStationGarrisonPoints( void )
clearFlags.set( MODELCONDITION_SPECIAL_DAMAGED );
clearFlags.set( MODELCONDITION_DAMAGED );
setFlags.set( MODELCONDITION_GARRISONED );

// Safety check: verify structure and drawable still valid before calling clearAndSetModelConditionFlags
if( structure == NULL || structure->getDrawable() == NULL )
{
return;
}
structure->clearAndSetModelConditionFlags( clearFlags, setFlags );
conditionIndex = GARRISON_POINT_PRISTINE;


Coord3D tempBuffer[MAX_GARRISON_POINTS];
int t = 0;
for( ; t < MAX_GARRISON_POINTS; ++t )
{
// Safety check: verify structure still valid before accessing position
if( structure == NULL || structure->getPosition() == NULL )
{
return;
}
tempBuffer[ t ] = *(structure->getPosition());
}

// Safety check: verify structure still valid before calling getMultiLogicalBonePosition
if( structure == NULL )
{
return;
}
count = structure->getMultiLogicalBonePosition("STATION", modData->m_containMax, tempBuffer, NULL);
if ( count > 0) stationBonesFound = TRUE;

Expand All @@ -2029,7 +2061,11 @@ void GarrisonContain::loadStationGarrisonPoints( void )
m_stationPointList.push_back( tempStationPointData ); // store for later use
}
// restore the original condition flags
draw->replaceModelConditionFlags( originalFlags );
// Safety check: verify drawable still valid before restoring flags
if( draw != NULL && structure != NULL && structure->getDrawable() == draw )
{
draw->replaceModelConditionFlags( originalFlags );
}

//tempBuffer pops

Expand Down
Loading