From d1effee32d7dfb81e809f32a5c10e73a51501174 Mon Sep 17 00:00:00 2001
From: pogsan <42271125+pogsan@users.noreply.github.com>
Date: Sun, 4 Nov 2018 12:12:39 +0900
Subject: [PATCH] Update ManagedWebSocket.cs

CoreFx #29834 fix
---
 System.Net.WebSockets.Client.Managed/ManagedWebSocket.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/System.Net.WebSockets.Client.Managed/ManagedWebSocket.cs b/System.Net.WebSockets.Client.Managed/ManagedWebSocket.cs
index f5d8ebb..9c1f604 100644
--- a/System.Net.WebSockets.Client.Managed/ManagedWebSocket.cs
+++ b/System.Net.WebSockets.Client.Managed/ManagedWebSocket.cs
@@ -728,7 +728,7 @@ private async Task<WebSocketReceiveResult> ReceiveAsyncPrivate(ArraySegment<byte
 
                     // If this a text message, validate that it contains valid UTF8.
                     if (header.Opcode == MessageOpcode.Text &&
-                        !TryValidateUtf8(new ArraySegment<byte>(payloadBuffer.Array, payloadBuffer.Offset, bytesToCopy), header.Fin, _utf8TextState))
+                        !TryValidateUtf8(new ArraySegment<byte>(payloadBuffer.Array, payloadBuffer.Offset, bytesToCopy), header.Fin && header.PayloadLength == 0, _utf8TextState))
                     {
                         await CloseWithReceiveErrorAndThrowAsync(WebSocketCloseStatus.InvalidPayloadData, WebSocketError.Faulted, cancellationToken).ConfigureAwait(false);
                     }
@@ -1415,4 +1415,4 @@ private struct MessageHeader
             internal int Mask;
         }
     }
-}
\ No newline at end of file
+}