Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix _scan_data_descriptor_no_sig_by_decompression

Browse source
This commit is contained in:
Danny Lin 2025-06-01 14:05:09 +08:00
parent b5d7ae3a6a
commit 1d5ec61337
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/zipfile/__init__.py
View file

@ -1738,12 +1738,6 @@ def _scan_data_descriptor_no_sig(self, fp, offset, end_offset, zip64, chunk_size
return None
def _scan_data_descriptor_no_sig_by_decompression(self, fp, offset, end_offset, zip64, method):
dd_fmt = '<LQQ' if zip64 else '<LLL'
dd_size = struct.calcsize(dd_fmt)
if offset + dd_size > end_offset:
return False
try:
decompressor = _get_decompressor(method)
except NotImplementedError:
@ -1757,6 +1751,12 @@ def _scan_data_descriptor_no_sig_by_decompression(self, fp, offset, end_offset,
if isinstance(decompressor, LZMADecompressor):
return False
dd_fmt = '<LQQ' if zip64 else '<LLL'
dd_size = struct.calcsize(dd_fmt)
if end_offset - dd_size < offset:
return None
try:
pos = self._trace_compressed_block_end(fp, offset, end_offset - dd_size, decompressor)
except Exception:
@ -1764,7 +1764,10 @@ def _scan_data_descriptor_no_sig_by_decompression(self, fp, offset, end_offset,
fp.seek(pos)
dd = fp.read(dd_size)
crc, compress_size, file_size = struct.unpack(dd_fmt, dd)
try:
crc, compress_size, file_size = struct.unpack(dd_fmt, dd)
except struct.error:
return None
if pos - offset != compress_size:
return None