More complete module id error checking (stops OOB access from lua scr…

…ipt)
cortex-command-community · Nov 22, 2023 · e3db3e3 · e3db3e3
1 parent 001f917
commit e3db3e3
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Managers/PresetMan.cpp b/Managers/PresetMan.cpp
@@ -209,7 +209,7 @@ bool PresetMan::LoadAllDataModules() {
 
 const DataModule * PresetMan::GetDataModule(int whichModule)
 {
-    RTEAssert(whichModule < (int)m_pDataModules.size(), "Tried to access an out of bounds data module number!");
+    RTEAssert(whichModule >= 0 && whichModule < m_pDataModules.size(), "Tried to access an out of bounds data module number!");
     return m_pDataModules[whichModule];
 }
 
@@ -220,12 +220,10 @@ const DataModule * PresetMan::GetDataModule(int whichModule)
 
 const std::string PresetMan::GetDataModuleName(int whichModule)
 {
-    RTEAssert(whichModule < (int)m_pDataModules.size(), "Tried to access an out of bounds data module number!");
+    RTEAssert(whichModule >= 0 && whichModule < m_pDataModules.size(), "Tried to access an out of bounds data module number!");
     return m_pDataModules[whichModule]->GetFileName();
 }
 
-
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Method:          GetModuleID
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -374,7 +372,7 @@ bool PresetMan::AddEntityPreset(Entity *pEntToAdd, int whichModule, bool overwri
 
 const Entity * PresetMan::GetEntityPreset(std::string type, std::string preset, int whichModule)
 {
-    RTEAssert(whichModule < (int)m_pDataModules.size(), "Tried to access an out of bounds data module number!");
+    RTEAssert(whichModule >= 0 && whichModule < m_pDataModules.size(), "Tried to access an out of bounds data module number!");
 
     const Entity *pRetEntity = 0;