Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change ZipFile.ReadEntries to always look for the Zip64 central directory #363

Merged
merged 2 commits into from
Aug 8, 2019
Merged

Change ZipFile.ReadEntries to always look for the Zip64 central directory #363

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c175ed5
Change ZipFile.ReadEntries to always look for the Zip64 central direc…
Numpsy Jun 23, 2019
285a808
Add test for Zip64 preference
piksel Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/ICSharpCode.SharpZipLib/Zip/ZipFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3408,6 +3408,7 @@ private void ReadEntries()
}

bool isZip64 = false;
bool requireZip64 = false;

// Check if zip64 header information is required.
if ((thisDiskNumber == 0xffff) ||
Expand All @@ -3417,13 +3418,22 @@ private void ReadEntries()
(centralDirSize == 0xffffffff) ||
(offsetOfCentralDir == 0xffffffff))
{
isZip64 = true;
requireZip64 = true;
}

long offset = LocateBlockWithSignature(ZipConstants.Zip64CentralDirLocatorSignature, locatedEndOfCentralDir, 0, 0x1000);
if (offset < 0)
// #357 - always check for the existance of the Zip64 central directory.
long locatedZip64EndOfCentralDir = LocateBlockWithSignature(ZipConstants.Zip64CentralDirLocatorSignature, locatedEndOfCentralDir, 0, 0x1000);
if (locatedZip64EndOfCentralDir < 0)
{
if (requireZip64)
{
// This is only an error in cases where the Zip64 directory is required.
throw new ZipException("Cannot find Zip64 locator");
}
}
else
{
isZip64 = true;

// number of the disk with the start of the zip64 end of central directory 4 bytes
// relative offset of the zip64 end of central directory record 8 bytes
Expand Down