merge 3.5

benjaminp · benjaminp · commit ba77788bba7a · 2016-01-20T22:07:50.000-08:00
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
@@ -1143,6 +1143,7 @@ get_data(PyObject *archive, PyObject *toc_entry)
         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;
     }

Original file line number	Diff line number	Diff line change
`@@ -1143,6 +1143,7 @@ get_data(PyObject archive, PyObject toc_entry)`
`1143`	`1143`	`bytes_read = fread(buf, 1, data_size, fp);`
`1144`	`1144`	`} else {`
`1145`	`1145`	`fclose(fp);`
	`1146`	`+ Py_DECREF(raw_data);`
`1146`	`1147`	`PyErr_Format(ZipImportError, "can't read Zip file: %R", archive);`
`1147`	`1148`	`return NULL;`
`1148`	`1149`	`}`