Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Networking: Fix infinite loop and deadlock when closing socket.

Browse Source
This commit is contained in:
hondacrx
2021-02-11 12:33:05 -05:00
parent 0fd5044a71
commit 5431374491
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Networking/SocketBase.cs
+1 -1
View File
@@ -119,7 +119,7 @@ namespace Framework.Networking
public void CloseSocket() public void CloseSocket()
{ {
if (_socket == null) if (_socket == null || !_socket.Connected)
return; return;
try try
Source/Game/Server/WorldSession.cs
+3
View File
@@ -74,7 +74,10 @@ namespace Game
for (byte i = 0; i < 2; ++i) for (byte i = 0; i < 2; ++i)
{ {
if (m_Socket[i] != null) if (m_Socket[i] != null)
{
m_Socket[i].CloseSocket(); m_Socket[i].CloseSocket();
m_Socket[i] = null;
}
} }
// empty incoming packet queue // empty incoming packet queue