mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-29 10:49:48 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix related to segfault when a network disconnect occurs while a thread is updating a slot

Browse Source
This commit is contained in:
Mark Vejvoda
2010-10-21 00:21:58 +00:00
parent bc7ba297fd
commit f5f406dfb3
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/glest_game/network/server_interface.cpp
View File

@@ -260,6 +260,8 @@ void ServerInterface::updateSlot(ConnectionSlotEvent *event) {
bool &socketTriggered = event->socketTriggered; bool &socketTriggered = event->socketTriggered;
bool checkForNewClients = true; bool checkForNewClients = true;
// Safety check since we can experience a disconnect and the slot is NULL
if(slots[event->triggerId] == connectionSlot) {
if(connectionSlot != NULL && if(connectionSlot != NULL &&
(gameHasBeenInitiated == false || (connectionSlot->getSocket() != NULL && socketTriggered == true))) { (gameHasBeenInitiated == false || (connectionSlot->getSocket() != NULL && socketTriggered == true))) {
if(connectionSlot->isConnected() == false || socketTriggered == true) { if(connectionSlot->isConnected() == false || socketTriggered == true) {
@@ -271,6 +273,10 @@ void ServerInterface::updateSlot(ConnectionSlotEvent *event) {
else { else {
if(gameHasBeenInitiated) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] getSocket() == NULL\n",__FILE__,__FUNCTION__); if(gameHasBeenInitiated) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] getSocket() == NULL\n",__FILE__,__FUNCTION__);
} }
if(slots[event->triggerId] == connectionSlot) {
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
connectionSlot->update(checkForNewClients); connectionSlot->update(checkForNewClients);
// This means no clients are trying to connect at the moment // This means no clients are trying to connect at the moment
@@ -278,6 +284,18 @@ void ServerInterface::updateSlot(ConnectionSlotEvent *event) {
checkForNewClients = false; checkForNewClients = false;
} }
} }
else {
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
event->connectionSlot = slots[event->triggerId];
}
}
}
}
else {
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
event->connectionSlot = slots[event->triggerId];
} }
} }
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);