From e84547b9ef385ad9b2ad78bec6f09ba726e5b6ca Mon Sep 17 00:00:00 2001 From: "seer-by-sentry[bot]" <157164994+seer-by-sentry[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 20:04:16 +0000 Subject: [PATCH] Fix potential crash when calculating parachute attach height for null objects --- .../Source/GameLogic/Object/Contain/ParachuteContain.cpp | 5 ++++- .../Source/GameLogic/Object/Contain/ParachuteContain.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index bae366a9452..36d3b3679ab 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -185,7 +185,10 @@ void ParachuteContain::updateBonePositions() { //DEBUG_LOG(("*** No parachute-attach bone... using object height!")); m_riderAttachBone.zero(); - m_riderAttachBone.z += riderDraw->getDrawableGeometryInfo().getMaxHeightAbovePosition(); + if (riderDraw->getObject()) + { + m_riderAttachBone.z += riderDraw->getDrawableGeometryInfo().getMaxHeightAbovePosition(); + } } } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp index f7aa9b345eb..6909b995c07 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp @@ -186,7 +186,10 @@ void ParachuteContain::updateBonePositions() { //DEBUG_LOG(("*** No parachute-attach bone... using object height!")); m_riderAttachBone.zero(); - m_riderAttachBone.z += riderDraw->getDrawableGeometryInfo().getMaxHeightAbovePosition(); + if (riderDraw->getObject()) + { + m_riderAttachBone.z += riderDraw->getDrawableGeometryInfo().getMaxHeightAbovePosition(); + } } }