Merge pull request #1377 from tohidemyname/fixCheckSanity

UnhandledDataStructure should sanity check before allocating, not after
nissl-lab · Jul 3, 2024 · c731f1f · c731f1f
2 parents baa3a42 + cb47df4
commit c731f1f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/scratchpad/HWPF/Model/UnhandledDataStructure.cs b/scratchpad/HWPF/Model/UnhandledDataStructure.cs
@@ -25,13 +25,17 @@ public class UnhandledDataStructure
         public UnhandledDataStructure(byte[] buf, int offset, int length)
         {
             //    Console.WriteLine("Yes, using my code");
-            _buf = new byte[length];
             if (offset + length > buf.Length)
             {
                 throw new IndexOutOfRangeException("buffer length is " + buf.Length +
                                                     "but code is trying to read " + length + " from offset " + offset);
             }
-            Array.Copy(buf, offset, _buf, 0, length);
+            if(offset < 0 || length < 0)
+            {
+                throw new IndexOutOfBoundsException("Offset and Length must both be >= 0, negative " +
+                        "indicies are not permitted - code is tried to read " + length + " from offset " + offset);
+            }
+            _buf = Array.Copy(buf, offset, _buf, 0, length);
         }
 
         internal byte[] GetBuf()