Issue #26171: Prevent buffer overflow in get_data

Backport of 01ddd608b85c.
This commit is contained in:
Berker Peksag 2016-09-14 08:37:28 +03:00
parent 1f0e7c9933
commit d751040b1a
2 changed files with 8 additions and 0 deletions

View file

@ -10,6 +10,9 @@ What's New in Python 3.3.7?
Core and Builtins
-----------------
- Issue #26171: Fix possible integer overflow and heap corruption in
zipimporter.get_data().
- Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache.
- Issue #24407: Fix crash when dict is mutated while being updated.

View file

@ -1089,6 +1089,11 @@ get_data(PyObject *archive, PyObject *toc_entry)
PyMarshal_ReadShortFromFile(fp); /* local header size */
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;
if (bytes_size == 0)
bytes_size++;