Skip to content

fix: Prevent PlayerList::newGame array out-of-bounds and null dereferences #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −0
Open

fix: Prevent PlayerList::newGame array out-of-bounds and null dereferences #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Generals/Code/GameEngine/Source/Common/RTS/PlayerList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ void PlayerList::newGame()
if (pname.isEmpty())
continue; // it's neutral, which we've already done, so skip it.

if (m_playerCount >= MAX_PLAYER_COUNT)
{
DEBUG_ASSERTCRASH(false, ("Map has more player sides than MAX_PLAYER_COUNT (%d); skipping side '%s'", MAX_PLAYER_COUNT, pname.str()));
continue;
}

/// @todo The Player class should have a reset() method, instead of directly calling initFromDict() (MSB)
Player* p = m_players[m_playerCount++];
p->initFromDict(d);
Expand Down Expand Up @@ -188,6 +194,9 @@ void PlayerList::newGame()
Dict *d = TheSidesList->getSideInfo(i)->getDict();
Player* p = findPlayerWithNameKey(NAMEKEY(d->getAsciiString(TheKey_playerName)));

if (!p)
continue; // player was skipped (e.g. side count exceeded MAX_PLAYER_COUNT) or is neutral with no name key.

AsciiString tok;

AsciiString enemies = d->getAsciiString(TheKey_playerEnemies);
Expand Down
9 changes: 9 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ void PlayerList::newGame()
if (pname.isEmpty())
continue; // it's neutral, which we've already done, so skip it.

if (m_playerCount >= MAX_PLAYER_COUNT)
{
DEBUG_ASSERTCRASH(false, ("Map has more player sides than MAX_PLAYER_COUNT (%d); skipping side '%s'", MAX_PLAYER_COUNT, pname.str()));
continue;
}

/// @todo The Player class should have a reset() method, instead of directly calling initFromDict() (MSB)
Player* p = m_players[m_playerCount++];
p->initFromDict(d);
Expand Down Expand Up @@ -188,6 +194,9 @@ void PlayerList::newGame()
Dict *d = TheSidesList->getSideInfo(i)->getDict();
Player* p = findPlayerWithNameKey(NAMEKEY(d->getAsciiString(TheKey_playerName)));

if (!p)
continue; // player was skipped (e.g. side count exceeded MAX_PLAYER_COUNT) or is neutral with no name key.

AsciiString tok;

AsciiString enemies = d->getAsciiString(TheKey_playerEnemies);
Expand Down
Loading