Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-103861: Fix Zip64 extensions not being properly applied in some cases #103863

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
gpshead merged 6 commits into from
May 16, 2023
Merged

gh-103861: Fix Zip64 extensions not being properly applied in some cases #103863

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c42700d
Fix Zip64 extensions not being properly applied in some cases
pR0Ps Apr 26, 2023
d24c6a4
Fix edge cases in checking if zip64 extensions are required
pR0Ps Apr 28, 2023
9b66476
SQUASHME: Add zip64 default back to FileHeader
pR0Ps May 1, 2023
b68e70f
SQUASHME: Added comments to tests
pR0Ps May 1, 2023
ee7c78b
Restore ZipInfo.FileHeader zip64=None default to maintain backwards c…
gpshead May 16, 2023
0276ce9
Merge branch 'main' into bugfix/force-zip64
gpshead May 16, 2023
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
Restore ZipInfo.FileHeader zip64=None default to maintain backwards c… 
…ompatibility in the API.

Code within this module always passes an explicit zip64, so the overall bug fix remains valid. We just don't want to break existing user code constructing their own ZipInfo objects and calling zi.FileHeader themselves for whatever reasons.  _(hopefully rare, but it isn't a protected or private API so we can't make assumptions)_
  • Loading branch information
@gpshead
gpshead authored May 16, 2023
commit ee7c78bd6f183e346cc4bdaa427043aaae9da874
13 changes: 11 additions & 2 deletions Lib/zipfile/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,13 @@ def __repr__(self):
result.append('>')
return ''.join(result)

def FileHeader(self, zip64=False):
"""Return the per-file header as a bytes object."""
def FileHeader(self, zip64=None):
"""Return the per-file header as a bytes object.

When the optional zip64 arg is None rather than a bool, we will
decide based upon the file_size and compress_size, if known,
False otherwise.
"""
dt = self.date_time
dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
Expand All @@ -455,6 +460,10 @@ def FileHeader(self, zip64=False):
extra = self.extra

min_version = 0
if zip64 is None:
# We always explicitly pass zip64 within this module.... This
# remains for anyone using ZipInfo.FileHeader as a public API.
zip64 = file_size > ZIP64_LIMIT or compress_size > ZIP64_LIMIT
if zip64:
fmt = '<HHQQ'
extra = extra + struct.pack(fmt,
Expand Down