merge 3.4

d52513cb · Benjamin Peterson · e5c05cc8 · b1db7580 · d52513cb
Kaydet (Commit) d52513cb authored Ock 22, 2016 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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)