From 3a8700e2a8daf6e760a7b2ef56a0abf097825aad Mon Sep 17 00:00:00 2001 From: "seer-by-sentry[bot]" <157164994+seer-by-sentry[bot]@users.noreply.github.com> Date: Sun, 16 Nov 2025 19:17:09 +0000 Subject: [PATCH] OpenContain: Add null check for contain module before calling isPassengerAllowedToFire --- .../Source/GameLogic/Object/Contain/OpenContain.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 8e42cbc9f7d..c45f89a128d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -1165,7 +1165,11 @@ Bool OpenContain::isPassengerAllowedToFire( ObjectID id ) const // If we are ourselves contained, our passengers need to check with them if they get past us if( getObject()->getContainedBy() != NULL ) - return getObject()->getContainedBy()->getContain()->isPassengerAllowedToFire(); + { + ContainModuleInterface* contain = getObject()->getContainedBy()->getContain(); + if( contain != NULL ) + return contain->isPassengerAllowedToFire(); + } return TRUE;// We say yes, and we are not inside something. }