From 92d3a9c418b812be21b51d8de6de72c4fb4b14f0 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny0838@gmail.com>
Date: Sun, 1 Jun 2025 11:14:19 +0800
Subject: [PATCH] Fix and optimize `_scan_data_descriptor_no_sig`

---
 Lib/zipfile/__init__.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/Lib/zipfile/__init__.py b/Lib/zipfile/__init__.py
index e014053bd2e..a53b5f38c86 100644
--- a/Lib/zipfile/__init__.py
+++ b/Lib/zipfile/__init__.py
@@ -1712,30 +1712,28 @@ def _scan_data_descriptor_no_sig(self, fp, offset, end_offset, zip64, chunk_size
         dd_fmt = '<LQQ' if zip64 else '<LLL'
         dd_size = struct.calcsize(dd_fmt)
 
-        base = offset
+        pos = offset
         remainder = b''
 
-        while base < end_offset:
-            fp.seek(base)
-            chunk = remainder + fp.read(min(chunk_size, end_offset - base))
-            if not chunk:
-                break
+        fp.seek(offset)
+        while pos < end_offset:
+            chunk = remainder + fp.read(min(chunk_size, end_offset - pos))
 
-            scan_limit = len(chunk) - dd_size + 1
+            delta = pos - len(remainder) - offset
             mv = memoryview(chunk)
-            for i in range(scan_limit):
+            for i in range(len(chunk) - dd_size + 1):
                 dd = mv[i:i + dd_size]
                 try:
                     crc, compress_size, file_size = struct.unpack(dd_fmt, dd)
                 except struct.error:
                     continue
-                if (base + i) - offset != compress_size:
+                if delta + i != compress_size:
                     continue
 
                 return crc, compress_size, file_size, dd_size
 
             remainder = chunk[-(dd_size - 1):]
-            base += scan_limit
+            pos += chunk_size
 
         return None