starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-11-15 17:02:03 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Preserve legacy 7z property size compatibility during preflight

Browse Source
This commit is contained in:
Adam Hathcock
2026-11-13 09:36:55 +00:00
parent 101c939cc6
commit 2f040283fc
3 changed files with 119 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/SharpCompress/Common/SevenZip/ArchiveReader.Async.cs
View File

@@ -338,7 +338,11 @@ internal sealed partial class ArchiveReader
}
var numFiles = ReadNum();
ValidateFileCount(numFiles, unpackSizes.Count);
ValidateFileCount(
numFiles,
unpackSizes.Count,
db._majorVersion > 0 || db._minorVersion > 2
);
db._files = new List<CFileItem>(numFiles);
for (var i = 0; i < numFiles; i++)
{

18
src/SharpCompress/Common/SevenZip/ArchiveReader.cs
View File

@@ -714,8 +714,18 @@ internal partial class ArchiveReader
return (int)size;
}
private void ValidateFileCount(int numFiles, int numStreams)
private void ValidateFileCount(int numFiles, int numStreams, bool checkRecordsSize)
{
if (!checkRecordsSize)
{
// Before 0.3, known properties may have inaccurate sizes, so walking
// them by their declared lengths would disagree with the real parser.
// Bound the allocation by the minimum possible empty-stream bitmap;
// ReadBitVector separately bounds the actual bitmap at its read position.
var minimumEmptyStreams = Math.Max(0L, (long)numFiles - numStreams);
_currentReader.RequireBytes((minimumEmptyStreams + 7) / 8);
return;
}
// Nonempty files correspond to already parsed substreams. Empty files
// require one bit each in kEmptyStream, not one byte per file. Preflight
// that property before allocating CFileItem objects or implicit vectors.
@@ -914,7 +924,11 @@ internal partial class ArchiveReader
}
var numFiles = ReadNum();
ValidateFileCount(numFiles, unpackSizes.Count);
ValidateFileCount(
numFiles,
unpackSizes.Count,
db._majorVersion > 0 || db._minorVersion > 2
);
db._files = new List<CFileItem>(numFiles);
for (var i = 0; i < numFiles; i++)
{