From 5bb04c02045ba76d5f43dee174f62d6ba40ddad6 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Mon, 14 Nov 2022 09:43:15 +0000
Subject: [PATCH] Use Stream extension to ensure read operations return the
 requested number of bytes (unless EOF arrives first).

---
 Adler32Context.cs  | 4 ++--
 CRC16Context.cs    | 4 ++--
 CRC32Context.cs    | 4 ++--
 CRC64Context.cs    | 4 ++--
 FletcherContext.cs | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Adler32Context.cs b/Adler32Context.cs
index 45dd71f9a..ee3dd7256 100644
--- a/Adler32Context.cs
+++ b/Adler32Context.cs
@@ -334,12 +334,12 @@ public sealed class Adler32Context : IChecksum
         ushort localSum2 = 0;
 
         var buffer = new byte[65536];
-        int read   = fileStream.Read(buffer, 0, 65536);
+        int read   = fileStream.EnsureRead(buffer, 0, 65536);
 
         while(read > 0)
         {
             Step(ref localSum1, ref localSum2, buffer, (uint)read, useNative, nativeContext);
-            read = fileStream.Read(buffer, 0, 65536);
+            read = fileStream.EnsureRead(buffer, 0, 65536);
         }
 
         var finalSum = (uint)((localSum2 << 16) | localSum1);
diff --git a/CRC16Context.cs b/CRC16Context.cs
index f012baaf7..3dd0705ff 100644
--- a/CRC16Context.cs
+++ b/CRC16Context.cs
@@ -371,7 +371,7 @@ public class Crc16Context : IChecksum
         ushort[][] localTable = table ?? GenerateTable(polynomial, inverse);
 
         var buffer = new byte[65536];
-        int read   = fileStream.Read(buffer, 0, 65536);
+        int read   = fileStream.EnsureRead(buffer, 0, 65536);
 
         while(read > 0)
         {
@@ -396,7 +396,7 @@ public class Crc16Context : IChecksum
                 }
             }
 
-            read = fileStream.Read(buffer, 0, 65536);
+            read = fileStream.EnsureRead(buffer, 0, 65536);
         }
 
         localHashInt ^= seed;
diff --git a/CRC32Context.cs b/CRC32Context.cs
index 032d919fc..eae5124fc 100644
--- a/CRC32Context.cs
+++ b/CRC32Context.cs
@@ -554,13 +554,13 @@ public sealed class Crc32Context : IChecksum
         uint[][] localTable = GenerateTable(polynomial);
 
         var buffer = new byte[65536];
-        int read   = fileStream.Read(buffer, 0, 65536);
+        int read   = fileStream.EnsureRead(buffer, 0, 65536);
 
         while(read > 0)
         {
             Step(ref localHashInt, localTable, buffer, (uint)read, useIso, useNative, nativeContext);
 
-            read = fileStream.Read(buffer, 0, 65536);
+            read = fileStream.EnsureRead(buffer, 0, 65536);
         }
 
         localHashInt ^= seed;
diff --git a/CRC64Context.cs b/CRC64Context.cs
index ba70ecce0..5f8b55a9b 100644
--- a/CRC64Context.cs
+++ b/CRC64Context.cs
@@ -498,13 +498,13 @@ public sealed class Crc64Context : IChecksum
         ulong[][] localTable = GenerateTable(polynomial);
 
         var buffer = new byte[65536];
-        int read   = fileStream.Read(buffer, 0, 65536);
+        int read   = fileStream.EnsureRead(buffer, 0, 65536);
 
         while(read > 0)
         {
             Step(ref localHashInt, localTable, buffer, (uint)read, useEcma, useNative, nativeContext);
 
-            read = fileStream.Read(buffer, 0, 65536);
+            read = fileStream.EnsureRead(buffer, 0, 65536);
         }
 
         localHashInt ^= seed;
diff --git a/FletcherContext.cs b/FletcherContext.cs
index ab867c85d..3b507c547 100644
--- a/FletcherContext.cs
+++ b/FletcherContext.cs
@@ -313,13 +313,13 @@ public sealed class Fletcher32Context : IChecksum
         ushort localSum2 = 0xFFFF;
 
         var buffer = new byte[65536];
-        int read   = fileStream.Read(buffer, 0, 65536);
+        int read   = fileStream.EnsureRead(buffer, 0, 65536);
 
         while(read > 0)
         {
             Step(ref localSum1, ref localSum2, buffer, (uint)read, useNative, nativeContext);
 
-            read = fileStream.Read(buffer, 0, 65536);
+            read = fileStream.EnsureRead(buffer, 0, 65536);
         }
 
         var finalSum = (uint)((localSum2 << 16) | localSum1);
@@ -641,13 +641,13 @@ public sealed class Fletcher16Context : IChecksum
         byte localSum2 = 0xFF;
 
         var buffer = new byte[65536];
-        int read   = fileStream.Read(buffer, 0, 65536);
+        int read   = fileStream.EnsureRead(buffer, 0, 65536);
 
         while(read > 0)
         {
             Step(ref localSum1, ref localSum2, buffer, (uint)read, useNative, nativeContext);
 
-            read = fileStream.Read(buffer, 0, 65536);
+            read = fileStream.EnsureRead(buffer, 0, 65536);
         }
 
         var finalSum = (ushort)((localSum2 << 8) | localSum1);