[GEN][ZH] Fix using uninitialized memory 'window' in GameWindowManagerScript's createGadget (#1127)

xezon · web-flow · commit e83038f7b943 · 2025-06-21T11:20:26.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp
@@ -1621,7 +1621,7 @@ static GameWindow *createGadget( char *type,
 																 WinInstanceData *instData, 
 																 void *data )
 {
-  GameWindow *window;
+  GameWindow *window = NULL;
 
   instData->m_owner = parent;
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp
@@ -1629,7 +1629,7 @@ static GameWindow *createGadget( char *type,
 																 WinInstanceData *instData, 
 																 void *data )
 {
-  GameWindow *window;
+  GameWindow *window = NULL;
 
   instData->m_owner = parent;
 

Original file line number	Diff line number	Diff line change
`@@ -1621,7 +1621,7 @@ static GameWindow createGadget( char type,`
`1621`	`1621`	`WinInstanceData *instData,`
`1622`	`1622`	`void *data )`
`1623`	`1623`	`{`
`1624`		`- GameWindow *window;`
	`1624`	`+ GameWindow *window = NULL;`
`1625`	`1625`
`1626`	`1626`	`instData->m_owner = parent;`
`1627`	`1627`
Original file line number	Diff line number	Diff line change
`@@ -1629,7 +1629,7 @@ static GameWindow createGadget( char type,`
`1629`	`1629`	`WinInstanceData *instData,`
`1630`	`1630`	`void *data )`
`1631`	`1631`	`{`
`1632`		`- GameWindow *window;`
	`1632`	`+ GameWindow *window = NULL;`
`1633`	`1633`
`1634`	`1634`	`instData->m_owner = parent;`
`1635`	`1635`