icedream
/
gmadsharp
mirror of https://github.com/icedream/gmadsharp.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed exception when CRC32 hash is mismatching for the base addon, kept it for files inside the addon. Referring to #2.

lua-bytecode
Icedream 2014-12-11 02:09:32 +01:00
parent d35c00dbac
commit 24e7674f57
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/addoncreator/Addon/AddonFile.cs
View File

@ -88,7 +88,9 @@ namespace GarrysMod.AddonCreator.Addon
|| sr.ReadByte() != FormatVersion) || sr.ReadByte() != FormatVersion)
throw new FormatException(); throw new FormatException();
#if DEBUG
// Check addon's CRC32 hash // Check addon's CRC32 hash
// TODO: Garry's code actually calculates CRC32 hashes differently in edge cases. The code used for it is from zlib-1.1.3. See https://github.com/garrynewman/bootil/blob/master/src/3rdParty/smhasher/crc.cpp#L4.
{ {
Debug.WriteLine("Checking CRC32..."); Debug.WriteLine("Checking CRC32...");
var baseAddon = new byte[stream.Length - sizeof (int)]; var baseAddon = new byte[stream.Length - sizeof (int)];
@ -96,12 +98,13 @@ namespace GarrysMod.AddonCreator.Addon
stream.Position = 0; stream.Position = 0;
stream.Read(baseAddon, 0, baseAddon.Length); stream.Read(baseAddon, 0, baseAddon.Length);
var baseAddonHash = sr.ReadInt32(); var baseAddonHash = sr.ReadInt32();
if (ParallelCRC.Compute(baseAddon) != baseAddonHash) var calcAddonHash = ParallelCRC.Compute(baseAddon);
{ Debug.WriteLine("\tCalculated hash: {0}; Wanted hash: {1}", calcAddonHash, baseAddonHash);
throw new IOException("Data corrupted (calculated hash mismatching hash in addon file)"); Debug.Assert(calcAddonHash == baseAddonHash, "CRC32 hash mismatch",
} "Calculated CRC32 hash is different from the one saved within the addon. Causes could be a corrupted file or the edge case bug https://github.com/icedream/gmadsharp/issues/2.");
stream.Position = oldpos; stream.Position = oldpos;
} }
#endif
// Import metadata // Import metadata
var newSteamID = sr.ReadUInt64(); var newSteamID = sr.ReadUInt64();
@ -191,6 +194,7 @@ namespace GarrysMod.AddonCreator.Addon
// CRC check for this file // CRC check for this file
var fileCalcHash = ParallelCRC.Compute(fileContent); var fileCalcHash = ParallelCRC.Compute(fileContent);
Debug.WriteLine("\t\tCalculated hash: {0}; Wanted hash: {1}", fileCalcHash, fileHash);
if (fileCalcHash != fileHash) if (fileCalcHash != fileHash)
{ {
throw new IOException("File " + filePath + " in addon file is corrupted (hash mismatch)"); throw new IOException("File " + filePath + " in addon file is corrupted (hash mismatch)");