Skip to content

Fix: Guard against null controlling player in Team relationship #385

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
Open

Fix: Guard against null controlling player in Team relationship #385

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
6 changes: 5 additions & 1 deletion Generals/Code/GameEngine/Source/Common/RTS/Team.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,7 +1492,11 @@ Relationship Team::getRelationship(const Team *that) const
}

// nope -- go with our Player's view on the matter.
return getControllingPlayer()->getRelationship(that);
// TheSuperHackers @bugfix Mauller 16/03/2026 Guard against null controlling player to prevent access violation
const Player* controllingPlayer = getControllingPlayer();
if (controllingPlayer == nullptr)
return NEUTRAL;
return controllingPlayer->getRelationship(that);
}

// ------------------------------------------------------------------------
Expand Down
6 changes: 5 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,11 @@ Relationship Team::getRelationship(const Team *that) const
}

// nope -- go with our Player's view on the matter.
return getControllingPlayer()->getRelationship(that);
// TheSuperHackers @bugfix Mauller 16/03/2026 Guard against null controlling player to prevent access violation
const Player* controllingPlayer = getControllingPlayer();
if (controllingPlayer == nullptr)
return NEUTRAL;
return controllingPlayer->getRelationship(that);
}

// ------------------------------------------------------------------------
Expand Down
Loading