SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-02-14 05:36:07 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Pad short MS-ZIP blocks

Browse Source
This commit is contained in:
Matt Nadareski
2025-07-28 16:28:13 -04:00
parent 3c05bece9e
commit 12e8349ab1
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BinaryObjectScanner/FileType/MicrosoftCAB.cs
View File

@@ -156,7 +156,7 @@ namespace BinaryObjectScanner.FileType
{
var db = dataBlocks[i];
if (db?.CompressedData == null)
continue;
continue;
// Uncompressed data
if ((folder.CompressionType & CompressionType.MASK_TYPE) == CompressionType.TYPE_NONE)
@@ -171,8 +171,14 @@ namespace BinaryObjectScanner.FileType
long position = ms.Position;
mszip.CopyTo(db.CompressedData, ms);
long decompressedSize = ms.Position - position;
if (decompressedSize != db.UncompressedSize)
Console.Error.WriteLine($"Data block {i} in folder {folderIndex} did not decompress properly. Expected: {db.UncompressedSize} Got: {decompressedSize}");
// Pad to the correct size but throw a warning about this
if (decompressedSize < db.UncompressedSize)
{
Console.Error.WriteLine($"Data block {i} in folder {folderIndex} had mismatching sizes. Expected: {db.UncompressedSize}, Got: {decompressedSize}");
byte[] padding = new byte[db.UncompressedSize - decompressedSize];
ms.Write(padding, 0, padding.Length);
}
}
// Quantum