From 7c0475669cb1a7051497d0e0de341774d6e7675f Mon Sep 17 00:00:00 2001 From: "seer-by-sentry[bot]" <157164994+seer-by-sentry[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2026 23:13:36 +0000 Subject: [PATCH] fix(specialpower): Prevent null pointer dereference in Thing::setPosition --- .../GameLogic/Object/SpecialPower/SpecialPowerModule.cpp | 3 +++ .../GameLogic/Object/SpecialPower/SpecialPowerModule.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp index 24db1aab346..87eb787a297 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp @@ -448,6 +448,9 @@ void SpecialPowerModule::triggerSpecialPower( const Coord3D *location ) //------------------------------------------------------------------------------------------------- void SpecialPowerModule::createViewObject( const Coord3D *location ) { + if( location == nullptr ) + return; + const SpecialPowerModuleData *modData = getSpecialPowerModuleData(); const SpecialPowerTemplate *powerTemplate = modData->m_specialPowerTemplate; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp index 34d3ba6a126..ad83e08ccc7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp @@ -494,6 +494,9 @@ void SpecialPowerModule::triggerSpecialPower( const Coord3D *location ) //------------------------------------------------------------------------------------------------- void SpecialPowerModule::createViewObject( const Coord3D *location ) { + if( location == nullptr ) + return; + const SpecialPowerModuleData *modData = getSpecialPowerModuleData(); const SpecialPowerTemplate *powerTemplate = modData->m_specialPowerTemplate;