bpo-29774: Improve error reporting for corrupted extra field in ZIP file. (#583)

feccdb2a · Serhiy Storchaka · Victor Stinner · 964281af · feccdb2a
Commit feccdb2a authored Mar 09, 2017 by Serhiy Storchaka Committed by Victor Stinner Mar 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Lib/zipfile.py Lib/zipfile.py +3 -1

No files found.
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -438,7 +438,9 @@ class ZipInfo (object):
        unpack = struct.unpack
        while len(extra) >= 4:
            tp, ln = unpack('<HH', extra[:4])
-            if tp == 1:
+            if ln+4 > len(extra):
+                raise BadZipFile("Corrupt extra field %04x (size=%d)" % (tp, ln))
+            if tp == 0x0001:
                if ln >= 24:
                    counts = unpack('<QQQ', extra[4:28])
                elif ln == 16: