Refactor _validate_local_file_entry

danny0838 · danny0838 · commit 51c9254cfb73 · 2025-05-25T10:09:49.000+08:00
diff --git a/Lib/zipfile/__init__.py b/Lib/zipfile/__init__.py
@@ -1593,7 +1593,8 @@ def _validate_local_file_entry(self, fp, offset, end_offset):
             )
 
             dd = self._scan_data_descriptor(fp, pos, end_offset, zip64)
-
+            if dd is None:
+                dd = self._scan_data_descriptor_no_sig(fp, pos, end_offset, zip64)
             if dd is None:
                 return None
 
@@ -1636,7 +1637,7 @@ def _scan_data_descriptor(self, fp, offset, end_offset, zip64):
 
             return crc, compress_size, file_size, dd_size
 
-        return self._scan_data_descriptor_no_sig(fp, offset, end_offset, zip64)
+        return None
 
     def _scan_data_descriptor_no_sig(self, fp, offset, end_offset, zip64, chunk_size=8192):
         dd_fmt = '<LQQ' if zip64 else '<LLL'
