[GEN][ZH] Fix using uninitialized memory 'curVictim' in EMPUpdate (#1094)

xezon · web-flow · commit 9d64a430cd31 · 2025-06-21T11:12:14.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp
@@ -180,8 +180,8 @@ void EMPUpdate::doDisableAttack( void )
 	Real curVictimDistSqr;
 	const Coord3D *pos = object->getPosition();
 
-	SimpleObjectIterator *iter;
-	Object *curVictim;
+	SimpleObjectIterator *iter = NULL;
+	Object *curVictim = NULL;
 
 	if (radius > 0.0f)
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp
@@ -198,8 +198,8 @@ void EMPUpdate::doDisableAttack( void )
 		}
 	}
 
-	SimpleObjectIterator *iter;
-	Object *curVictim;
+	SimpleObjectIterator *iter = NULL;
+	Object *curVictim = NULL;
 
 	if (radius > 0.0f)
 	{
@@ -499,8 +499,8 @@ void LeafletDropBehavior::doDisableAttack( void )
 	Real curVictimDistSqr;
 	const Coord3D *pos = object->getPosition();
 
-	SimpleObjectIterator *iter;
-	Object *curVictim;
+	SimpleObjectIterator *iter = NULL;
+	Object *curVictim = NULL;
 
 	if (radius > 0.0f)
 	{

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,8 @@ void EMPUpdate::doDisableAttack( void )`
`180`	`180`	`Real curVictimDistSqr;`
`181`	`181`	`const Coord3D *pos = object->getPosition();`
`182`	`182`
`183`		`- SimpleObjectIterator *iter;`
`184`		`- Object *curVictim;`
	`183`	`+ SimpleObjectIterator *iter = NULL;`
	`184`	`+ Object *curVictim = NULL;`
`185`	`185`
`186`	`186`	`if (radius > 0.0f)`
`187`	`187`	`{`
Original file line number	Diff line number	Diff line change
`@@ -198,8 +198,8 @@ void EMPUpdate::doDisableAttack( void )`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`
`201`		`- SimpleObjectIterator *iter;`
`202`		`- Object *curVictim;`
	`201`	`+ SimpleObjectIterator *iter = NULL;`
	`202`	`+ Object *curVictim = NULL;`
`203`	`203`
`204`	`204`	`if (radius > 0.0f)`
`205`	`205`	`{`
`@@ -499,8 +499,8 @@ void LeafletDropBehavior::doDisableAttack( void )`
`499`	`499`	`Real curVictimDistSqr;`
`500`	`500`	`const Coord3D *pos = object->getPosition();`
`501`	`501`
`502`		`- SimpleObjectIterator *iter;`
`503`		`- Object *curVictim;`
	`502`	`+ SimpleObjectIterator *iter = NULL;`
	`503`	`+ Object *curVictim = NULL;`
`504`	`504`
`505`	`505`	`if (radius > 0.0f)`
`506`	`506`	`{`