From 28a77f10e4022afb62d9d23ba817ece0ee780efb Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Fri, 1 Oct 2010 18:12:40 +0200 Subject: [PATCH] Server crash fix --- common/server_protocolhandler.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp index 828051c0d..87054352d 100644 --- a/common/server_protocolhandler.cpp +++ b/common/server_protocolhandler.cpp @@ -825,6 +825,8 @@ ResponseCode Server_ProtocolHandler::cmdCreateArrow(Command_CreateArrow *cmd, Co if (!startZone || (!targetZone && !playerTarget)) return RespNameNotFound; Server_Card *startCard = startZone->getCard(cmd->getStartCardId(), false); + if (!startCard) + return RespNameNotFound; Server_Card *targetCard = 0; if (!playerTarget) { targetCard = targetZone->getCard(cmd->getTargetCardId(), false); @@ -837,6 +839,8 @@ ResponseCode Server_ProtocolHandler::cmdCreateArrow(Command_CreateArrow *cmd, Co targetItem = targetPlayer; else targetItem = targetCard; + if (!targetItem) + return RespNameNotFound; QMapIterator arrowIterator(player->getArrows()); while (arrowIterator.hasNext()) {