Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-38635: Simplify decoding the ZIP64 extra field and make it tolerant to extra data. (GH-16988)

This commit is contained in:
Serhiy Storchaka 2019-11-09 13:13:36 +02:00 committed by GitHub
parent fc6b1bf869
commit e27449da92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Lib/zipfile.py
View File

@ -465,44 +465,23 @@ class ZipInfo (object):
if ln+4 > len(extra): if ln+4 > len(extra):
raise BadZipFile("Corrupt extra field %04x (size=%d)" % (tp, ln)) raise BadZipFile("Corrupt extra field %04x (size=%d)" % (tp, ln))
if tp == 0x0001: if tp == 0x0001:
if ln >= 24: data = extra[4:ln+4]
counts = unpack('<QQQ', extra[4:28])
elif ln == 16:
counts = unpack('<QQ', extra[4:20])
elif ln == 8:
counts = unpack('<Q', extra[4:12])
elif ln == 0:
counts = ()
else:
raise BadZipFile("Corrupt extra field %04x (size=%d)" % (tp, ln))
idx = 0
# ZIP64 extension (large files and/or large archives) # ZIP64 extension (large files and/or large archives)
if self.file_size in (0xffffffffffffffff, 0xffffffff): try:
if len(counts) <= idx: if self.file_size in (0xFFFF_FFFF_FFFF_FFFF, 0xFFFF_FFFF):
raise BadZipFile( field = "File size"
"Corrupt zip64 extra field. File size not found." self.file_size, = unpack('<Q', data[:8])
) data = data[8:]
self.file_size = counts[idx] if self.compress_size == 0xFFFF_FFFF:
idx += 1 field = "Compress size"
self.compress_size, = unpack('<Q', data[:8])
if self.compress_size == 0xFFFFFFFF: data = data[8:]
if len(counts) <= idx: if self.header_offset == 0xFFFF_FFFF:
raise BadZipFile( field = "Header offset"
"Corrupt zip64 extra field. Compress size not found." self.header_offset, = unpack('<Q', data[:8])
) except struct.error:
self.compress_size = counts[idx] raise BadZipFile(f"Corrupt zip64 extra field. "
idx += 1 f"{field} not found.") from None
if self.header_offset == 0xffffffff:
if len(counts) <= idx:
raise BadZipFile(
"Corrupt zip64 extra field. Header offset not found."
)
old = self.header_offset
self.header_offset = counts[idx]
idx+=1
extra = extra[ln+4:] extra = extra[ln+4:]