Fix typo & EndOfStream exceptions

ModernWoWTools · Jul 9, 2024 · 7695ed9 · 7695ed9
1 parent a5903f9
commit 7695ed9
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/Warcraft.NET/Extensions/ExtendedIO.cs b/Warcraft.NET/Extensions/ExtendedIO.cs
@@ -645,15 +645,25 @@ public static bool SeekChunk(this BinaryReader reader, string chunkSignature, bo
 
             try
             {
-                var foundChuckSignature = reader.ReadBinarySignature(reverseSignature);
-                while (foundChuckSignature != chunkSignature)
+                var foundChunkSignature = reader.ReadBinarySignature(reverseSignature);
+                while (foundChunkSignature != chunkSignature)
                 {
                     var size = reader.ReadUInt32();
+
+                    // Return if we are about to seek outside of range
+                    if ((reader.BaseStream.Position + size) > reader.BaseStream.Length)
+                        return false;
+
                     reader.BaseStream.Position += size;
-                    foundChuckSignature = reader.ReadBinarySignature(reverseSignature);
+
+                    // Return if we're done reading
+                    if (reader.BaseStream.Position == reader.BaseStream.Length)
+                        return false;
+
+                    foundChunkSignature = reader.ReadBinarySignature(reverseSignature);
                 }
 
-                if (foundChuckSignature == chunkSignature)
+                if (foundChunkSignature == chunkSignature)
                 {
                     if (!skipSignature)
                         reader.BaseStream.Position -= sizeof(uint);