flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #1647 from mc-server/SocketThreadsFix

Browse Source 
Fixes socket leak in HTTP server.
This commit is contained in:
Mattes D 2014-12-06 16:08:08 +01:00
commit 3f23813412
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/OSSupport/SocketThreads.cpp
View File

@ -86,7 +86,8 @@ void cSocketThreads::RemoveClient(const cCallback * a_Client)
}
} // for itr - m_Threads[]
ASSERT(!"Removing an unknown client");
// This client wasn't found.
// It's not an error, because it may have been removed by a different thread in the meantime.
}
@ -491,10 +492,17 @@ void cSocketThreads::cSocketThread::ReadFromSockets(fd_set * a_Read)
{
case sSlot::ssNormal:
{
// Notify the callback that the remote has closed the socket; keep the slot
m_Slots[i].m_Client->SocketClosed();
// Close the socket on our side:
m_Slots[i].m_State = sSlot::ssRemoteClosed;
m_Slots[i].m_Socket.CloseSocket();
// Notify the callback that the remote has closed the socket, *after* removing the socket:
cCallback * client = m_Slots[i].m_Client;
m_Slots[i] = m_Slots[--m_NumSlots];
if (client != nullptr)
{
client->SocketClosed();
}
break;
}
case sSlot::ssWritingRestOut: