fix buffer leak

OPCFoundation · Apr 10, 2023 · 59109ff · 59109ff
1 parent a4b31d6
commit 59109ff
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/Stack/Opc.Ua.Core/Stack/Tcp/TcpMessageSocket.cs b/Stack/Opc.Ua.Core/Stack/Tcp/TcpMessageSocket.cs
@@ -551,6 +551,12 @@ private void OnReadComplete(object sender, SocketAsyncEventArgs e)
                     e?.Dispose();
                 }
 
+                if (m_readState == ReadState.NotConnected &&
+                    ServiceResult.IsGood(error))
+                {
+                    error = ServiceResult.Create(StatusCodes.BadConnectionClosed, "Remote side closed connection.");
+                }
+
                 if (ServiceResult.IsBad(error))
                 {
                     if (m_receiveBuffer != null)
@@ -673,22 +679,11 @@ private void ReadNextBlock()
             // check if already closed.
             lock (m_socketLock)
             {
-                if (m_socket == null)
-                {
-                    if (m_receiveBuffer != null)
-                    {
-                        m_bufferManager.ReturnBuffer(m_receiveBuffer, "ReadNextBlock");
-                        m_receiveBuffer = null;
-                    }
-                    m_readState = ReadState.NotConnected;
-                    return;
-                }
-
                 socket = m_socket;
 
-                // avoid stale ServiceException when socket is disconnected
-                if (!socket.Connected)
+                if (socket == null || !socket.Connected)
                 {
+                    // buffer is returned in calling code
                     m_readState = ReadState.NotConnected;
                     return;
                 }