Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.5 (#26171)

This commit is contained in:
Benjamin Peterson 2016-01-20 22:25:40 -08:00
parent ba77788bba 47b8ba22e3
commit 2b0b5ac5a0
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -140,6 +140,9 @@ Core and Builtins
converted to normal strings at run time. Given x=3, then converted to normal strings at run time. Given x=3, then
f'value={x}' == 'value=3'. Patch by Eric V. Smith. f'value={x}' == 'value=3'. Patch by Eric V. Smith.
- Issue #26171: Fix possible integer overflow and heap corruption in
zipimporter.get_data().
Library Library
------- -------

5
Modules/zipimport.c
View File

@ -1127,6 +1127,11 @@ get_data(PyObject *archive, PyObject *toc_entry)
} }
file_offset += l; /* Start of file data */ file_offset += l; /* Start of file data */
if (data_size > LONG_MAX - 1) {
fclose(fp);
PyErr_NoMemory();
return NULL;
}
bytes_size = compress == 0 ? data_size : data_size + 1; bytes_size = compress == 0 ? data_size : data_size + 1;
if (bytes_size == 0) if (bytes_size == 0)
bytes_size++; bytes_size++;