Skip to content

Commit 92d3a9c

Browse files
committed
Fix and optimize _scan_data_descriptor_no_sig
1 parent 8067b0c commit 92d3a9c

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

Lib/zipfile/__init__.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,30 +1712,28 @@ def _scan_data_descriptor_no_sig(self, fp, offset, end_offset, zip64, chunk_size
17121712
dd_fmt = '<LQQ' if zip64 else '<LLL'
17131713
dd_size = struct.calcsize(dd_fmt)
17141714

1715-
base = offset
1715+
pos = offset
17161716
remainder = b''
17171717

1718-
while base < end_offset:
1719-
fp.seek(base)
1720-
chunk = remainder + fp.read(min(chunk_size, end_offset - base))
1721-
if not chunk:
1722-
break
1718+
fp.seek(offset)
1719+
while pos < end_offset:
1720+
chunk = remainder + fp.read(min(chunk_size, end_offset - pos))
17231721

1724-
scan_limit = len(chunk) - dd_size + 1
1722+
delta = pos - len(remainder) - offset
17251723
mv = memoryview(chunk)
1726-
for i in range(scan_limit):
1724+
for i in range(len(chunk) - dd_size + 1):
17271725
dd = mv[i:i + dd_size]
17281726
try:
17291727
crc, compress_size, file_size = struct.unpack(dd_fmt, dd)
17301728
except struct.error:
17311729
continue
1732-
if (base + i) - offset != compress_size:
1730+
if delta + i != compress_size:
17331731
continue
17341732

17351733
return crc, compress_size, file_size, dd_size
17361734

17371735
remainder = chunk[-(dd_size - 1):]
1738-
base += scan_limit
1736+
pos += chunk_size
17391737

17401738
return None
17411739

0 commit comments

Comments
 (0)