Skip to content

Commit e360529

Browse files
authored
Merge pull request #473 from GeneralsOnlineDevelopmentTeam/seer/bugfix/loadscreen-slot-null-check
bugfix(loadscreen): Prevent null pointer dereference when accessing game slot
2 parents ee7f8d9 + 33acdb0 commit e360529

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

Core/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1990,7 +1990,8 @@ void MapTransferLoadScreen::init( GameInfo *game )
19901990
GadgetStaticTextSetText(m_progressText[netSlot], UnicodeString::TheEmptyString );
19911991
m_progressText[netSlot]->winSetEnabledTextColors(houseColor, m_progressText[netSlot]->winGetEnabledTextBorderColor());
19921992

1993-
if ((i == 0 || (TheGameInfo->getConstSlot(i)->isHuman() && TheGameInfo->getConstSlot(i)->hasMap())) && m_progressBars[netSlot])
1993+
const GameSlot *gameInfoSlot = TheGameInfo->getConstSlot(i);
1994+
if ((i == 0 || (gameInfoSlot && gameInfoSlot->isHuman() && gameInfoSlot->hasMap())) && m_progressBars[netSlot])
19941995
m_progressBars[netSlot]->winHide(TRUE);
19951996

19961997
m_playerLookup[i] = netSlot; // save our mapping so we can update progress correctly

0 commit comments

Comments
 (0)