From 31be2df752ce6993cc11c44e27f44df594118e43 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sun, 9 Jan 2011 05:12:48 +0000 Subject: [PATCH] - ftp bugfix for a segfault discovered --- source/glest_game/network/server_interface.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp index 661e91f4..7a5d58c1 100644 --- a/source/glest_game/network/server_interface.cpp +++ b/source/glest_game/network/server_interface.cpp @@ -166,10 +166,12 @@ int ServerInterface::isValidClientType(uint32 clientIp) { MutexSafeWrapper safeMutex(&slotAccessorMutexes[i],intToStr(__LINE__) + "_" + intToStr(i) + "_" + intToStr(i)); Socket *socket = slots[i]->getSocket(); - uint32 slotIp = socket->getConnectedIPAddress(socket->getIpAddress()); - if(slotIp == clientIp) { - result = 1; - break; + if(socket != NULL) { + uint32 slotIp = socket->getConnectedIPAddress(socket->getIpAddress()); + if(slotIp == clientIp) { + result = 1; + break; + } } } }