Skip to content

Fix updating zips whose entries have descriptors. #475

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

Merged
piksel merged 5 commits into from
Nov 21, 2020
Merged

Fix updating zips whose entries have descriptors. #475

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68c0a58
Unit tests for using ZipFile to update file entries that have descrip…
Numpsy Jun 9, 2020
6411e6d
fix size calculation in GetDescriptorSize
Numpsy Jun 22, 2020
01e8135
Handle optional descriptor signature when updating
piksel Aug 11, 2020
0fd6396
Handle optional descriptor signature when updating
piksel Aug 11, 2020
2eedb2f
Merge branch 'master' into rw/zipfile/test_descriptor_update
piksel Nov 21, 2020
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
Prev Previous commit
Next Next commit
fix size calculation in GetDescriptorSize
  • Loading branch information
@Numpsy
Numpsy committed Jun 22, 2020
commit 6411e6d050ce0e02b316546b39f5c1d6e43673b2
4 changes: 2 additions & 2 deletions src/ICSharpCode.SharpZipLib/Zip/ZipFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2466,10 +2466,10 @@ private int GetDescriptorSize(ZipUpdate update)
int result = 0;
if ((update.Entry.Flags & (int)GeneralBitFlags.Descriptor) != 0)
{
result = ZipConstants.DataDescriptorSize - 4;
result = ZipConstants.DataDescriptorSize;
if (update.Entry.LocalHeaderRequiresZip64)
{
result = ZipConstants.Zip64DataDescriptorSize - 4;
result = ZipConstants.Zip64DataDescriptorSize;
}
}
return result;
Expand Down
⌂ 换网址