diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp index 57bd9bca84..86e11df1bd 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp @@ -3302,6 +3302,9 @@ Object *PartitionManager::getClosestObjects( */ for (Int curRadius = 0; curRadius <= maxRadiusLimit; ++curRadius) { + // Safety check: ensure m_radiusVec is initialized and curRadius is within bounds + if (m_radiusVec.empty() || curRadius >= static_cast(m_radiusVec.size())) + continue; const OffsetVec& offsets = m_radiusVec[curRadius]; if (offsets.empty()) continue;