merge 3.4

0bf7813b · Benjamin Peterson · 1e267c18 · 02246381 · 0bf7813b
Commit 0bf7813b authored Jan 21, 2016 by Benjamin Peterson
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Modules/zipimport.c Modules/zipimport.c +4 -0

No files found.
--- 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)