diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp index c9016d189a..b19a3099cd 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -366,6 +366,9 @@ Team *TeamFactory::createTeam(const AsciiString& name) { Team *t = NULL; t = createInactiveTeam(name); + if (t == nullptr) { + return nullptr; + } t->setActive(); return t; } diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp index 30c8f07721..72bfcfe937 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp @@ -366,6 +366,9 @@ Team *TeamFactory::createTeam(const AsciiString& name) { Team *t = NULL; t = createInactiveTeam(name); + if (t == nullptr) { + return nullptr; + } t->setActive(); return t; }