Skip to content

Commit c9a9a0d

Browse files
committed
[GEN][ZH] Fix using uninitialized memory 'mask' in getHumanPlayerMask()
1 parent ef5fea1 commit c9a9a0d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2897,12 +2897,12 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
28972897

28982898
static PlayerMaskType getHumanPlayerMask( void )
28992899
{
2900-
PlayerMaskType mask;
2900+
PlayerMaskType mask = 0;
29012901
for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)
29022902
{
29032903
const Player *player = ThePlayerList->getNthPlayer(i);
29042904
if (player->getPlayerType() == PLAYER_HUMAN)
2905-
mask &= player->getPlayerMask();
2905+
mask |= player->getPlayerMask();
29062906
}
29072907

29082908
//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X\n", mask));

GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2993,12 +2993,12 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
29932993

29942994
static PlayerMaskType getHumanPlayerMask( void )
29952995
{
2996-
PlayerMaskType mask;
2996+
PlayerMaskType mask = 0;
29972997
for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)
29982998
{
29992999
const Player *player = ThePlayerList->getNthPlayer(i);
30003000
if (player->getPlayerType() == PLAYER_HUMAN)
3001-
mask &= player->getPlayerMask();
3001+
mask |= player->getPlayerMask();
30023002
}
30033003

30043004
//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X\n", mask));

0 commit comments

Comments
 (0)