Merge pull request #6 from tinohager/master

Fix buffer receive logic
akacdev · Aug 20, 2024 · ec1ce5d · ec1ce5d
2 parents 84690c6 + 1b4c566
commit ec1ce5d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Certstream/Certstream.cs b/Certstream/Certstream.cs
@@ -191,15 +191,23 @@ public async void Connect()
             while (WebSocket.State == WebSocketState.Open)
             {
                 byte[] receiveBuffer = new byte[Constants.BufferSize];
-
                 int offset = 0;
+
                 while (true)
                 {
                     try
                     {
-                        ArraySegment<byte> bytesReceived = new(receiveBuffer, offset, receiveBuffer.Length);
+                        int remainingBufferSpace = receiveBuffer.Length - offset;
+
+                        if (remainingBufferSpace <= 0)
+                        {
+                            throw new InvalidOperationException("Buffer overflow: The receive buffer is full.");
+                        }
+
+                        ArraySegment<byte> bytesReceived = new(receiveBuffer, offset, remainingBufferSpace);
 
                         WebSocketReceiveResult result = await WebSocket.ReceiveAsync(bytesReceived, CancellationSource.Token);
+
                         offset += result.Count;
 
                         if (result.EndOfMessage) break;