changeset:   100036:5533a9e02b21
branch:      3.5
parent:      100032:670de0acba80
parent:      100035:8b58c9328f5c
user:        Benjamin Peterson <benjamin@python.org>
date:        Thu Jan 21 22:03:55 2016 -0800
files:       Modules/zipimport.c
description:
merge 3.4


diff -r 670de0acba80 -r 5533a9e02b21 Modules/zipimport.c
--- a/Modules/zipimport.c	Thu Jan 21 21:06:47 2016 -0800
+++ b/Modules/zipimport.c	Thu Jan 21 22:03:55 2016 -0800
@@ -1091,6 +1091,10 @@
                           &date, &crc)) {
         return NULL;
     }
+    if (data_size < 0) {
+        PyErr_Format(ZipImportError, "negative data size");
+        return NULL;
+    }
 
     fp = _Py_fopen_obj(archive, "rb");
     if (!fp)