Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10696 from jackpoz/socket_race_condition

Browse Source 
Core/Socket: Fix race condition in WorldSocket
This commit is contained in:
Nay
2013-09-01 15:52:57 -07:00
parent 68b447b24c f23b5fb96d
commit 69a0800cb7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Server/WorldSocket.cpp
View File

@@ -445,9 +445,15 @@ int WorldSocket::Update (void)
if (closing_)
return -1;
if (m_OutActive || (m_OutBuffer->length() == 0 && msg_queue()->is_empty()))
if (m_OutActive)
return 0;
{
ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, 0);
if (m_OutBuffer->length() == 0 && msg_queue()->is_empty())
return 0;
}
int ret;
do
ret = handle_output(get_handle());