Skip to content

Commit 6052950

Browse files
committed
[GEN][ZH] Fix crash within Team::killTeam() caused by an invalid player retrieval in ScriptEngine::getPlayerFromAsciiString()
1 parent 1ebce07 commit 6052950

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5125,7 +5125,8 @@ Player *ScriptEngine::getPlayerFromAsciiString(const AsciiString& playerString)
51255125
else if (playerString == THIS_PLAYER_ENEMY) {
51265126
return getSkirmishEnemyPlayer();
51275127
}
5128-
else {
5128+
// TheSuperHackers @bugfix Mauller 01/07/2025 we need to ignore empty player strings as they can return an invalid and uninitialised player from the player list
5129+
else if (playerString.isNotEmpty()){
51295130
NameKeyType key = NAMEKEY(playerString);
51305131
Player *pPlayer = ThePlayerList->findPlayerWithNameKey(key);
51315132
if (pPlayer!=NULL) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5841,7 +5841,8 @@ Player *ScriptEngine::getPlayerFromAsciiString(const AsciiString& playerString)
58415841
else if (playerString == THIS_PLAYER_ENEMY) {
58425842
return getSkirmishEnemyPlayer();
58435843
}
5844-
else {
5844+
// TheSuperHackers @bugfix Mauller 01/07/2025 we need to ignore empty player strings as they can return an invalid and uninitialised player from the player list
5845+
else if (playerString.isNotEmpty()){
58455846
NameKeyType key = NAMEKEY(playerString);
58465847
Player *pPlayer = ThePlayerList->findPlayerWithNameKey(key);
58475848
if (pPlayer!=NULL) {

0 commit comments

Comments
 (0)