Skip to content

MissileLauncherBuildingUpdate: Add safety check for destroyed objects #66

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

Draft
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −0
Draft

MissileLauncherBuildingUpdate: Add safety check for destroyed objects #66

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
13 changes: 13 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
return;

const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();

// Safety check: if the module data has been cleared during destruction, don't proceed
if (!d)
return;
ModelConditionFlags clr, set;
UnsignedInt now = TheGameLogic->getFrame();
switch (dst)
Expand Down Expand Up @@ -229,6 +233,10 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
return UPDATE_SLEEP_NONE;

const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();

// Safety check: if the module data has been cleared during destruction, don't proceed
if (!d)
return UPDATE_SLEEP_NONE;

UnsignedInt now = TheGameLogic->getFrame();

Expand Down Expand Up @@ -275,6 +283,11 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
SpecialPowerTemplate* MissileLauncherBuildingUpdate::getTemplate() const
{
const MissileLauncherBuildingUpdateModuleData* data = getMissileLauncherBuildingUpdateModuleData();

// Safety check: if the module data has been cleared during destruction, return NULL
if (!data)
return NULL;

return data->m_specialPowerTemplate;
}

Expand Down
13 changes: 13 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
return;

const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();

// Safety check: if the module data has been cleared during destruction, don't proceed
if (!d)
return;
ModelConditionFlags clr, set;
UnsignedInt now = TheGameLogic->getFrame();
switch (dst)
Expand Down Expand Up @@ -245,6 +249,10 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
return UPDATE_SLEEP_NONE;

const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();

// Safety check: if the module data has been cleared during destruction, don't proceed
if (!d)
return UPDATE_SLEEP_NONE;

UnsignedInt now = TheGameLogic->getFrame();

Expand Down Expand Up @@ -291,6 +299,11 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
SpecialPowerTemplate* MissileLauncherBuildingUpdate::getTemplate() const
{
const MissileLauncherBuildingUpdateModuleData* data = getMissileLauncherBuildingUpdateModuleData();

// Safety check: if the module data has been cleared during destruction, return NULL
if (!data)
return NULL;

return data->m_specialPowerTemplate;
}

Expand Down
Loading