From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 9 Mar 2017 16:34:03 +0000 (+0200)
Subject: bpo-29774: Improve error reporting for corrupted extra field in ZIP file. (#583)
X-Git-Tag: v3.7.0a1~1166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=feccdb2a249a71be330765be77dee57121866779;p=python

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

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index b5c16dbc12..8a19ca246b 100644
--- 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: