fix(script): Fix using uninitialized memory 'mask' in getHumanPlayerMask() (#1114)

xezon · web-flow · commit 4dc13d01dc0f · 2025-07-30T18:32:19.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
@@ -2953,12 +2953,20 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
 
 static PlayerMaskType getHumanPlayerMask( void )
 {
+#if RETAIL_COMPATIBLE_CRC
 	PlayerMaskType mask;
+#else
+	PlayerMaskType mask = 0;
+#endif
 	for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)
 	{
 		const Player *player = ThePlayerList->getNthPlayer(i);
 		if (player->getPlayerType() == PLAYER_HUMAN)
+#if RETAIL_COMPATIBLE_CRC
 			mask &= player->getPlayerMask();
+#else
+			mask |= player->getPlayerMask();
+#endif
 	}
 
 	//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X", mask));
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
@@ -3049,12 +3049,20 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
 
 static PlayerMaskType getHumanPlayerMask( void )
 {
+#if RETAIL_COMPATIBLE_CRC
 	PlayerMaskType mask;
+#else
+	PlayerMaskType mask = 0;
+#endif
 	for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)
 	{
 		const Player *player = ThePlayerList->getNthPlayer(i);
 		if (player->getPlayerType() == PLAYER_HUMAN)
+#if RETAIL_COMPATIBLE_CRC
 			mask &= player->getPlayerMask();
+#else
+			mask |= player->getPlayerMask();
+#endif
 	}
 
 	//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X", mask));

Original file line number	Diff line number	Diff line change
`@@ -2953,12 +2953,20 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)`
`2953`	`2953`
`2954`	`2954`	`static PlayerMaskType getHumanPlayerMask( void )`
`2955`	`2955`	`{`
	`2956`	`+#if RETAIL_COMPATIBLE_CRC`
`2956`	`2957`	`PlayerMaskType mask;`
	`2958`	`+#else`
	`2959`	`+ PlayerMaskType mask = 0;`
	`2960`	`+#endif`
`2957`	`2961`	`for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)`
`2958`	`2962`	`{`
`2959`	`2963`	`const Player *player = ThePlayerList->getNthPlayer(i);`
`2960`	`2964`	`if (player->getPlayerType() == PLAYER_HUMAN)`
	`2965`	`+#if RETAIL_COMPATIBLE_CRC`
`2961`	`2966`	`mask &= player->getPlayerMask();`
	`2967`	`+#else`
	`2968`	`+ mask \|= player->getPlayerMask();`
	`2969`	`+#endif`
`2962`	`2970`	`}`
`2963`	`2971`
`2964`	`2972`	`//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X", mask));`
Original file line number	Diff line number	Diff line change
`@@ -3049,12 +3049,20 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)`
`3049`	`3049`
`3050`	`3050`	`static PlayerMaskType getHumanPlayerMask( void )`
`3051`	`3051`	`{`
	`3052`	`+#if RETAIL_COMPATIBLE_CRC`
`3052`	`3053`	`PlayerMaskType mask;`
	`3054`	`+#else`
	`3055`	`+ PlayerMaskType mask = 0;`
	`3056`	`+#endif`
`3053`	`3057`	`for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)`
`3054`	`3058`	`{`
`3055`	`3059`	`const Player *player = ThePlayerList->getNthPlayer(i);`
`3056`	`3060`	`if (player->getPlayerType() == PLAYER_HUMAN)`
	`3061`	`+#if RETAIL_COMPATIBLE_CRC`
`3057`	`3062`	`mask &= player->getPlayerMask();`
	`3063`	`+#else`
	`3064`	`+ mask \|= player->getPlayerMask();`
	`3065`	`+#endif`
`3058`	`3066`	`}`
`3059`	`3067`
`3060`	`3068`	`//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X", mask));`