From 18d43b20d1254c356bb61aa4f2d12a48eca26bc3 Mon Sep 17 00:00:00 2001 From: "andrei.on1ca" Date: Thu, 27 Aug 2026 13:53:22 +0300 Subject: [PATCH] fix: stop closing the ping/receive wait handles while they are still in use --- .../Server/WebSocketSessionManager.cs | 43 +++++++++++-------- websocket-sharp/WebSocket.cs | 33 ++++++-------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/websocket-sharp/Server/WebSocketSessionManager.cs b/websocket-sharp/Server/WebSocketSessionManager.cs index baaef76ad..df7b3a76b 100644 --- a/websocket-sharp/Server/WebSocketSessionManager.cs +++ b/websocket-sharp/Server/WebSocketSessionManager.cs @@ -1622,38 +1622,43 @@ public void Sweep() _sweeping = true; } - foreach (var id in InactiveIDs) + try { - if (_state != ServerState.Start) - break; - - lock (_sync) + foreach (var id in InactiveIDs) { if (_state != ServerState.Start) break; - IWebSocketSession session; + lock (_sync) + { + if (_state != ServerState.Start) + break; - if (!_sessions.TryGetValue(id, out session)) - continue; + IWebSocketSession session; - var state = session.WebSocket.ReadyState; + if (!_sessions.TryGetValue(id, out session)) + continue; - if (state == WebSocketState.Open) - { - session.WebSocket.Close(CloseStatusCode.Abnormal); + var state = session.WebSocket.ReadyState; - continue; - } + if (state == WebSocketState.Open) + { + session.WebSocket.Close(CloseStatusCode.Abnormal); + + continue; + } - if (state == WebSocketState.Closing) - continue; + if (state == WebSocketState.Closing) + continue; - _sessions.Remove(id); + _sessions.Remove(id); + } } } - - _sweeping = false; + finally + { + _sweeping = false; + } } /// diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index f7b94f9c1..6bca345f4 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -1369,10 +1369,10 @@ private bool closeHandshake( frame.Unmask(); } - var wait = !received && sent && _receivingExited != null; + var exited = _receivingExited; - if (wait) - received = _receivingExited.WaitOne(_waitTime); + if (!received && sent && exited != null) + received = exited.WaitOne(_waitTime); var ret = sent && received; @@ -1946,7 +1946,12 @@ private bool processPongFrame(WebSocketFrame frame) try { - _pongReceived.Set(); + var received = _pongReceived; + + if (received == null) + return false; + + received.Set(); } catch (NullReferenceException) { @@ -2095,19 +2100,9 @@ private void releaseCommonResources() _inContinuation = false; } - if (_pongReceived != null) - { - _pongReceived.Close(); - - _pongReceived = null; - } - - if (_receivingExited != null) - { - _receivingExited.Close(); - _receivingExited = null; - } + _pongReceived = null; + _receivingExited = null; } private void releaseResources() @@ -2727,9 +2722,9 @@ internal void Close(PayloadData payloadData, byte[] rawFrame) _log.Trace("Begin closing the connection."); var sent = rawFrame != null && sendBytes(rawFrame); - var received = sent && _receivingExited != null - ? _receivingExited.WaitOne(_waitTime) - : false; + + var exited = _receivingExited; + var received = sent && exited != null && exited.WaitOne(_waitTime); var res = sent && received;