[GEN][ZH] Fix memory leak in SpecialAbilityUpdate::isWithinStartAbilityRange() (#845)

xezon · web-flow · commit 4154e9e57c23 · 2025-05-11T17:43:28.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp
@@ -776,6 +776,7 @@ Bool SpecialAbilityUpdate::isWithinStartAbilityRange() const
 			PartitionFilterLineOfSight	filterLOS( self );
 			PartitionFilter *filters[] = { &filterLOS, NULL };
 			ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( self, range, FROM_BOUNDINGSPHERE_2D, filters, ITER_SORTED_NEAR_TO_FAR );
+			MemoryPoolObjectHolder hold(iter);
 			for( Object *theTarget = iter->first(); theTarget; theTarget = iter->next() ) 
 			{
 				//LOS check succeeded.
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp
@@ -880,6 +880,7 @@ Bool SpecialAbilityUpdate::isWithinStartAbilityRange() const
       PartitionFilterLineOfSight  filterLOS( self );
       PartitionFilter *filters[] = { &filterLOS, NULL };
       ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( self, range, FROM_BOUNDINGSPHERE_2D, filters, ITER_SORTED_NEAR_TO_FAR );
+      MemoryPoolObjectHolder hold(iter);
       for( Object *theTarget = iter->first(); theTarget; theTarget = iter->next() ) 
       {
         //LOS check succeeded.

Original file line number	Diff line number	Diff line change
`@@ -776,6 +776,7 @@ Bool SpecialAbilityUpdate::isWithinStartAbilityRange() const`
`776`	`776`	`PartitionFilterLineOfSight filterLOS( self );`
`777`	`777`	`PartitionFilter *filters[] = { &filterLOS, NULL };`
`778`	`778`	`ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( self, range, FROM_BOUNDINGSPHERE_2D, filters, ITER_SORTED_NEAR_TO_FAR );`
	`779`	`+ MemoryPoolObjectHolder hold(iter);`
`779`	`780`	`for( Object *theTarget = iter->first(); theTarget; theTarget = iter->next() )`
`780`	`781`	`{`
`781`	`782`	`//LOS check succeeded.`
Original file line number	Diff line number	Diff line change
`@@ -880,6 +880,7 @@ Bool SpecialAbilityUpdate::isWithinStartAbilityRange() const`
`880`	`880`	`PartitionFilterLineOfSight filterLOS( self );`
`881`	`881`	`PartitionFilter *filters[] = { &filterLOS, NULL };`
`882`	`882`	`ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( self, range, FROM_BOUNDINGSPHERE_2D, filters, ITER_SORTED_NEAR_TO_FAR );`
	`883`	`+ MemoryPoolObjectHolder hold(iter);`
`883`	`884`	`for( Object *theTarget = iter->first(); theTarget; theTarget = iter->next() )`
`884`	`885`	`{`
`885`	`886`	`//LOS check succeeded.`