mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-02 12:32:34 +02:00
Code Issues Projects Releases Wiki Activity

Fixed potential OOS

Browse Source
This commit is contained in:
mathusummut
2018-09-27 00:13:16 +02:00
parent d8e2bfa263
commit 2ad935481e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/glest_game/game/commander.cpp
View File

@@ -427,8 +427,10 @@ namespace
const Unit * targetUnit, const Unit * targetUnit,
bool tryQueue, bool tryQueue,
int unitCommandGroupId, bool isMove) const { int unitCommandGroupId, bool isMove) const {
std::pair < CommandResult, string > result(crFailUndefined, "");
if (this->pauseNetworkCommands == true) { if (this->pauseNetworkCommands == true) {
return std::pair < CommandResult, string >(crFailUndefined, ""); return result;
} }
if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem). if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem).
@@ -438,8 +440,6 @@ namespace
extractFileFromDirectoryPath(__FILE__). extractFileFromDirectoryPath(__FILE__).
c_str(), __FUNCTION__, __LINE__); c_str(), __FUNCTION__, __LINE__);
std::pair < CommandResult, string > result(crFailUndefined, "");
if (selection->isEmpty() == false) { if (selection->isEmpty() == false) {
Vec2i Vec2i
refPos, refPos,
@@ -684,7 +684,7 @@ namespace
} }
/*throw /*throw
megaglest_runtime_error(szBuf);*/ megaglest_runtime_error(szBuf);*/
return result; return std::pair<CommandResult, string>(crFailUndefined, "");
} }
} }