[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/e82fb1d2febb
changeset:   100014:e82fb1d2febb
parent:      100010:68ec50003aca
parent:      100013:a3ac2cd93db9
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Jan 20 22:07:50 2016 -0800
summary:
  merge 3.5

files:
  Modules/zipimport.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Modules/zipimport.c b/Modules/zipimport.c
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -1143,6 +1143,7 @@
         bytes_read = fread(buf, 1, data_size, fp);
     } else {
         fclose(fp);
+        Py_DECREF(raw_data);
         PyErr_Format(ZipImportError, "can't read Zip file: %R", archive);
         return NULL;
     }

-- 
Repository URL: https://hg.python.org/cpython