[ZH] Add range check in removeDrawableFromLookupTable and removeObjectFromLookupTable (#764)

Mauller · xezon · commit 7c1b1ac3f7e4 · 2025-04-25T23:16:43.000+02:00
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
@@ -878,7 +878,8 @@ void GameClient::removeDrawableFromLookupTable( Drawable *draw )
 {
 
 	// sanity
-	if( draw == NULL )
+	// TheSuperHackers @fix Mauller/Xezon 24/04/2025 Prevent out of range access to vector lookup table
+	if( draw == NULL || static_cast<size_t>(draw->getID()) >= m_drawableVector.size() )
 		return;
 
 	// remove from table
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
@@ -3882,7 +3882,8 @@ void GameLogic::removeObjectFromLookupTable( Object *obj )
 {
 
 	// sanity
-	if( obj == NULL )
+	// TheSuperHackers @fix Mauller/Xezon 24/04/2025 Prevent out of range access to vector lookup table
+	if( obj == NULL || static_cast<size_t>(obj->getID()) >= m_objVector.size() )
 		return;
 
 	// remove from lookup table

Original file line number	Diff line number	Diff line change
`@@ -878,7 +878,8 @@ void GameClient::removeDrawableFromLookupTable( Drawable *draw )`
`878`	`878`	`{`
`879`	`879`
`880`	`880`	`// sanity`
`881`		`- if( draw == NULL )`
	`881`	`+ // TheSuperHackers @fix Mauller/Xezon 24/04/2025 Prevent out of range access to vector lookup table`
	`882`	`+ if( draw == NULL \|\| static_cast<size_t>(draw->getID()) >= m_drawableVector.size() )`
`882`	`883`	`return;`
`883`	`884`
`884`	`885`	`// remove from table`
Original file line number	Diff line number	Diff line change
`@@ -3882,7 +3882,8 @@ void GameLogic::removeObjectFromLookupTable( Object *obj )`
`3882`	`3882`	`{`
`3883`	`3883`
`3884`	`3884`	`// sanity`
`3885`		`- if( obj == NULL )`
	`3885`	`+ // TheSuperHackers @fix Mauller/Xezon 24/04/2025 Prevent out of range access to vector lookup table`
	`3886`	`+ if( obj == NULL \|\| static_cast<size_t>(obj->getID()) >= m_objVector.size() )`
`3886`	`3887`	`return;`
`3887`	`3888`
`3888`	`3889`	`// remove from lookup table`