Skip to content

Commit b1b16b9

Browse files
authored
[GEN][ZH] Prevent dereferencing NULL pointer 'TheWritableGlobalData' in GameLODManager::applyStaticLODLevel() (#1149)
1 parent b1e6792 commit b1b16b9

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Generals/Code/GameEngine/Source/Common/GameLOD.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,9 +577,10 @@ void GameLODManager::applyStaticLODLevel(StaticGameLODLevel level)
577577
TheWritableGlobalData->m_enableDynamicLOD = lodInfo->m_enableDynamicLOD;
578578
TheWritableGlobalData->m_useFpsLimit = lodInfo->m_useFpsLimit;
579579
TheWritableGlobalData->m_useTrees = requestedTrees;
580-
}
581-
if (!m_memPassed || isReallyLowMHz()) {
582-
TheWritableGlobalData->m_shellMapOn = false;
580+
581+
if (!m_memPassed || isReallyLowMHz()) {
582+
TheWritableGlobalData->m_shellMapOn = false;
583+
}
583584
}
584585
if (TheTerrainVisual)
585586
TheTerrainVisual->setTerrainTracksDetail();

GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,9 +582,10 @@ void GameLODManager::applyStaticLODLevel(StaticGameLODLevel level)
582582
TheWritableGlobalData->m_enableDynamicLOD = lodInfo->m_enableDynamicLOD;
583583
TheWritableGlobalData->m_useFpsLimit = lodInfo->m_useFpsLimit;
584584
TheWritableGlobalData->m_useTrees = requestedTrees;
585-
}
586-
if (!m_memPassed || isReallyLowMHz()) {
587-
TheWritableGlobalData->m_shellMapOn = false;
585+
586+
if (!m_memPassed || isReallyLowMHz()) {
587+
TheWritableGlobalData->m_shellMapOn = false;
588+
}
588589
}
589590
if (TheTerrainVisual)
590591
TheTerrainVisual->setTerrainTracksDetail();

0 commit comments

Comments
 (0)