Fix error when a stream returns less than the requested amount of bytes

Fixes aaubry#560 +semver:patch
cloudguard-so · Jan 14, 2021 · c7ec908 · c7ec908
1 parent b3ae4c7
commit c7ec908
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/YamlDotNet/Core/LookAheadBuffer.cs b/YamlDotNet/Core/LookAheadBuffer.cs
@@ -125,10 +125,25 @@ public void Cache(int length)
 
         private void FillBuffer()
         {
-            var readCount = input.Read(buffer, writeOffset, blockSize);
-            writeOffset = blockSize - writeOffset;
-            endOfInput = readCount < blockSize;
-            count += readCount;
+            var remainingSize = blockSize;
+            do
+            {
+                var readCount = input.Read(buffer, writeOffset, remainingSize);
+                if (readCount == 0)
+                {
+                    endOfInput = true;
+                    break;
+                }
+
+                remainingSize -= readCount;
+                writeOffset += readCount;
+                count += readCount;
+            } while (remainingSize > 0);
+
+            if (writeOffset == buffer.Length)
+            {
+                writeOffset = 0;
+            }
         }
 
         /// <summary>