From 4f50810791ac879a8838b4d0751198ba2ecde921 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Fri, 5 Feb 2021 19:47:12 +0900
Subject: [PATCH] [Modify] Move it

---
 websocket-sharp/Net/RequestStream.cs | 77 +++++++++++++++++++---------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/websocket-sharp/Net/RequestStream.cs b/websocket-sharp/Net/RequestStream.cs
index 44f96fe5..1a4e3f8a 100644
--- a/websocket-sharp/Net/RequestStream.cs
+++ b/websocket-sharp/Net/RequestStream.cs
@@ -122,33 +122,10 @@ namespace WebSocketSharp.Net
       // - 0   0 byte read from the internal buffer
       // - -1  No more content data
 
-      if (buffer == null)
-        throw new ArgumentNullException ("buffer");
-
-      if (offset < 0) {
-        var msg = "A negative value.";
-
-        throw new ArgumentOutOfRangeException ("offset", msg);
-      }
-
-      if (count < 0) {
-        var msg = "A negative value.";
-
-        throw new ArgumentOutOfRangeException ("count", msg);
-      }
-
-      var len = buffer.Length;
-
-      if (offset + count > len) {
-        var msg = "The sum of 'offset' and 'count' is greater than the length of 'buffer'.";
-
-        throw new ArgumentException (msg);
-      }
-
       if (_bodyLeft == 0)
         return -1;
 
-      if (_count == 0 || count == 0)
+      if (_count == 0)
         return 0;
 
       if (count > _count)
@@ -179,6 +156,32 @@ namespace WebSocketSharp.Net
       if (_disposed)
         throw new ObjectDisposedException (GetType ().ToString ());
 
+      if (buffer == null)
+        throw new ArgumentNullException ("buffer");
+
+      if (offset < 0) {
+        var msg = "A negative value.";
+
+        throw new ArgumentOutOfRangeException ("offset", msg);
+      }
+
+      if (count < 0) {
+        var msg = "A negative value.";
+
+        throw new ArgumentOutOfRangeException ("count", msg);
+      }
+
+      var len = buffer.Length;
+
+      if (offset + count > len) {
+        var msg = "The sum of 'offset' and 'count' is greater than the length of 'buffer'.";
+
+        throw new ArgumentException (msg);
+      }
+
+      if (count == 0)
+        return _stream.BeginRead (buffer, offset, count, callback, state);
+
       var nread = fillFromBuffer (buffer, offset, count);
 
       if (nread != 0) {
@@ -249,6 +252,32 @@ namespace WebSocketSharp.Net
       if (_disposed)
         throw new ObjectDisposedException (GetType ().ToString ());
 
+      if (buffer == null)
+        throw new ArgumentNullException ("buffer");
+
+      if (offset < 0) {
+        var msg = "A negative value.";
+
+        throw new ArgumentOutOfRangeException ("offset", msg);
+      }
+
+      if (count < 0) {
+        var msg = "A negative value.";
+
+        throw new ArgumentOutOfRangeException ("count", msg);
+      }
+
+      var len = buffer.Length;
+
+      if (offset + count > len) {
+        var msg = "The sum of 'offset' and 'count' is greater than the length of 'buffer'.";
+
+        throw new ArgumentException (msg);
+      }
+
+      if (count == 0)
+        return 0;
+
       var nread = fillFromBuffer (buffer, offset, count);
 
       if (nread == -1)