Add actual/expected crc32 in mismatch exception

ValveResourceFormat · Dec 31, 2023 · e1d5486 · e1d5486
1 parent 088ded3
commit e1d5486
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/ValvePak/ValvePak.Test/PackageTest.cs b/ValvePak/ValvePak.Test/PackageTest.cs
@@ -292,7 +292,8 @@ public void ThrowsOnInvalidCRC32()
  file.CRC32 = 0xDEADBEEF;
 
  Assert.Throws<InvalidDataException>(() => package.ReadEntry(file, out _));
- Assert.Throws<InvalidDataException>(() => package.ReadEntry(file, out _, true));
+ var ex = Assert.Throws<InvalidDataException>(() => package.ReadEntry(file, out _, true));
+ Assert.That(ex.Message, Is.EqualTo("CRC32 mismatch for read data (expected DEADBEEF, got 32CFF012)."));
  Assert.DoesNotThrow(() => package.ReadEntry(file, out _, false));
  }
 

diff --git a/ValvePak/ValvePak/Package.Read.cs b/ValvePak/ValvePak/Package.Read.cs
@@ -152,9 +152,16 @@ public void ReadEntry(PackageEntry entry, byte[] output, bool validateCrc = true
  }
  }
 
- if (validateCrc && entry.CRC32 != Crc32.Compute(output, totalLength))
+ if (!validateCrc)
  {
- throw new InvalidDataException("CRC32 mismatch for read data.");
+ return;
+ }
+
+ var actualChecksum = Crc32.Compute(output, totalLength);
+
+ if (entry.CRC32 != actualChecksum)
+ {
+ throw new InvalidDataException($"CRC32 mismatch for read data (expected {entry.CRC32:X2}, got {actualChecksum:X2}).");
  }
  }