merge 3.5

benjaminp · benjaminp · commit ae8c078dbb93 · 2016-01-21T22:04:04.000-08:00
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
@@ -1091,6 +1091,10 @@ get_data(PyObject *archive, PyObject *toc_entry)
                           &date, &crc)) {
         return NULL;
     }
+    if (data_size < 0) {
+        PyErr_Format(ZipImportError, "negative data size");
+        return NULL;
+    }
 
     fp = _Py_fopen_obj(archive, "rb");
     if (!fp)
