games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-21 12:06:49 +02:00
Code Issues Releases Activity

Merge pull request #687 from kambala-decapitator/fix-server-crash-client-disconnect

Browse Source 
fix server crash on unexpected client disconnect
This commit is contained in:
Alexander Shishkin 2021-04-29 16:03:07 +03:00 committed by GitHub
commit b310f2e61e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/CGameHandler.cpp
View File

@ -1195,11 +1195,11 @@ void CGameHandler::handleClientDisconnection(std::shared_ptr<CConnection> c)
{ {
for(auto playerConns : connections) for(auto playerConns : connections)
{ {
for(auto conn : playerConns.second) for(auto i = playerConns.second.begin(); i != playerConns.second.end(); )
{ {
if(lobby->state != EServerState::SHUTDOWN && conn == c) if(lobby->state != EServerState::SHUTDOWN && *i == c)
{ {
vstd::erase_if_present(playerConns.second, conn); i = playerConns.second.erase(i);
if(playerConns.second.size()) if(playerConns.second.size())
continue; continue;
PlayerCheated pc; PlayerCheated pc;
@ -1208,6 +1208,8 @@ void CGameHandler::handleClientDisconnection(std::shared_ptr<CConnection> c)
sendAndApply(&pc); sendAndApply(&pc);
checkVictoryLossConditionsForPlayer(playerConns.first); checkVictoryLossConditionsForPlayer(playerConns.first);
} }
else
++i;
} }
} }
} }
@ -5267,7 +5269,7 @@ void CGameHandler::checkVictoryLossConditionsForAll()
void CGameHandler::checkVictoryLossConditionsForPlayer(PlayerColor player) void CGameHandler::checkVictoryLossConditionsForPlayer(PlayerColor player)
{ {
const PlayerState * p = getPlayer(player); const PlayerState * p = getPlayer(player);
if (p->status != EPlayerStatus::INGAME) return; if (!p || p->status != EPlayerStatus::INGAME) return;
auto victoryLossCheckResult = gs->checkForVictoryAndLoss(player); auto victoryLossCheckResult = gs->checkForVictoryAndLoss(player);