merge 3.4

This commit is contained in:
Benjamin Peterson 2016-01-21 22:03:55 -08:00
commit d52513cb22
1 changed files with 4 additions and 0 deletions

View File

@ -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)