[GEN][ZH] Fix drawable assignment in StealthUpdate::changeVisualDisguise() (#730)

Mauller · helmutbuhler · xezon · commit 388879e6d9f1 · 2025-04-27T17:13:59.000+02:00
Co-authored-by: Helmut Buhler &lt;buhler@8gadgetpack.net&gt;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
@@ -755,7 +755,9 @@ void StealthUpdate::changeVisualDisguise()
 
 		const ThingTemplate *tTemplate = self->getTemplate();
 
-		TheThingFactory->newDrawable( tTemplate );
+		// TheSuperHackers @fix helmutbuhler 13/04/2025 Fixes missing pointer assignment for the new drawable.
+		// This originally caused no runtime crash because the new drawable is allocated at the same address as the previously deleted drawable via the MemoryPoolBlob.
+		draw = TheThingFactory->newDrawable( tTemplate );
 		if( draw )
 		{
 			TheGameLogic->bindObjectAndDrawable(self, draw);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
@@ -1055,7 +1055,9 @@ void StealthUpdate::changeVisualDisguise()
 
 		const ThingTemplate *tTemplate = self->getTemplate();
 
-		TheThingFactory->newDrawable( tTemplate );
+		// TheSuperHackers @fix helmutbuhler 13/04/2025 Fixes missing pointer assignment for the new drawable.
+		// This originally caused no runtime crash because the new drawable is allocated at the same address as the previously deleted drawable via the MemoryPoolBlob.
+		draw = TheThingFactory->newDrawable( tTemplate );
 		if( draw )
 		{
 			TheGameLogic->bindObjectAndDrawable(self, draw);

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,9 @@ void StealthUpdate::changeVisualDisguise()`
`755`	`755`
`756`	`756`	`const ThingTemplate *tTemplate = self->getTemplate();`
`757`	`757`
`758`		`- TheThingFactory->newDrawable( tTemplate );`
	`758`	`+ // TheSuperHackers @fix helmutbuhler 13/04/2025 Fixes missing pointer assignment for the new drawable.`
	`759`	`+ // This originally caused no runtime crash because the new drawable is allocated at the same address as the previously deleted drawable via the MemoryPoolBlob.`
	`760`	`+ draw = TheThingFactory->newDrawable( tTemplate );`
`759`	`761`	`if( draw )`
`760`	`762`	`{`
`761`	`763`	`TheGameLogic->bindObjectAndDrawable(self, draw);`
Original file line number	Diff line number	Diff line change
`@@ -1055,7 +1055,9 @@ void StealthUpdate::changeVisualDisguise()`
`1055`	`1055`
`1056`	`1056`	`const ThingTemplate *tTemplate = self->getTemplate();`
`1057`	`1057`
`1058`		`- TheThingFactory->newDrawable( tTemplate );`
	`1058`	`+ // TheSuperHackers @fix helmutbuhler 13/04/2025 Fixes missing pointer assignment for the new drawable.`
	`1059`	`+ // This originally caused no runtime crash because the new drawable is allocated at the same address as the previously deleted drawable via the MemoryPoolBlob.`
	`1060`	`+ draw = TheThingFactory->newDrawable( tTemplate );`
`1059`	`1061`	`if( draw )`
`1060`	`1062`	`{`
`1061`	`1063`	`TheGameLogic->bindObjectAndDrawable(self, draw);`