Skip to content

Fix: Prevent null dereference in SpecialPowerModule #395

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: Prevent null dereference in SpecialPowerModule #395

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
3 changes: 2 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
{
//A sharedNSync special only startPowerRecharges when first scienced or when executed,
//Since a new modue with same SPTemplates may construct at any time.
if ( getSpecialPowerTemplate()->isSharedNSync() == FALSE )
if ( getSpecialPowerTemplate() != nullptr && getSpecialPowerTemplate()->isSharedNSync() == FALSE )
startPowerRecharge();
}
// WE USED TO DO THE POLL-EVERYBODY-AND-VOTE-ON-WHO-TO-SYNC-TO THING HERE,
Expand All @@ -128,6 +128,7 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
// lets make sure TheIngameUI knows about our public timer
// add this weapon to the UI if it has a public timer for all to see
if( m_pausedCount == 0 &&
getSpecialPowerTemplate() != nullptr &&
getSpecialPowerTemplate()->isSharedNSync() == TRUE &&
getSpecialPowerTemplate()->hasPublicTimer() == TRUE &&
getObject()->getControllingPlayer() &&
Expand Down
3 changes: 2 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
{
//A sharedNSync special only startPowerRecharges when first scienced or when executed,
//Since a new module with same SPTemplates may construct at any time.
if ( getSpecialPowerTemplate()->isSharedNSync() == FALSE )
if ( getSpecialPowerTemplate() != nullptr && getSpecialPowerTemplate()->isSharedNSync() == FALSE )
startPowerRecharge();
}
// WE USED TO DO THE POLL-EVERYBODY-AND-VOTE-ON-WHO-TO-SYNC-TO THING HERE,
Expand All @@ -131,6 +131,7 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
// lets make sure TheIngameUI knows about our public timer
// add this weapon to the UI if it has a public timer for all to see
if( m_pausedCount == 0 &&
getSpecialPowerTemplate() != nullptr &&
getSpecialPowerTemplate()->isSharedNSync() == TRUE &&
getSpecialPowerTemplate()->hasPublicTimer() == TRUE &&
getObject()->getControllingPlayer() &&
Expand Down
Loading