Skip to content

MessageStream: Add null checks for ThePlayerList and local player before accessing player index #76

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
+24 −2
Open

MessageStream: Add null checks for ThePlayerList and local player before accessing player index #76

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
13 changes: 12 additions & 1 deletion Generals/Code/GameEngine/Source/Common/MessageStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,18 @@ CommandList *TheCommandList = NULL;
*/
GameMessage::GameMessage( GameMessage::Type type )
{
m_playerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
// Defensive programming: Check if ThePlayerList is initialized before dereferencing
// This prevents crashes during early initialization or shutdown when Windows messages
// can arrive before the game state is fully ready
if (ThePlayerList != NULL && ThePlayerList->getLocalPlayer() != NULL)
{
m_playerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
}
else
{
// Use neutral player index (0) as a safe default when ThePlayerList is not yet initialized
m_playerIndex = 0;
}
m_type = type;
m_argList = NULL;
m_argTail = NULL;
Expand Down
13 changes: 12 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,18 @@ CommandList* TheCommandList = NULL;
*/
GameMessage::GameMessage(GameMessage::Type type)
{
m_playerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
// Defensive programming: Check if ThePlayerList is initialized before dereferencing
// This prevents crashes during early initialization or shutdown when Windows messages
// can arrive before the game state is fully ready
if (ThePlayerList != NULL && ThePlayerList->getLocalPlayer() != NULL)
{
m_playerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
}
else
{
// Use neutral player index (0) as a safe default when ThePlayerList is not yet initialized
m_playerIndex = 0;
}
m_type = type;
m_argList = NULL;
m_argTail = NULL;
Expand Down
Loading