Commit 1b57d96c authored by Berker Peksag's avatar Berker Peksag

Issue #26171: Prevent buffer overflow in get_data

Backport of 01ddd608b85c.
parent 9ee93511
...@@ -10,6 +10,9 @@ What's New in Python 3.3.7? ...@@ -10,6 +10,9 @@ What's New in Python 3.3.7?
Core and Builtins 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 #25709: Fixed problem with in-place string concatenation and utf-8 cache.
- Issue #24407: Fix crash when dict is mutated while being updated. - Issue #24407: Fix crash when dict is mutated while being updated.
......
...@@ -1089,6 +1089,11 @@ get_data(PyObject *archive, PyObject *toc_entry) ...@@ -1089,6 +1089,11 @@ get_data(PyObject *archive, PyObject *toc_entry)
PyMarshal_ReadShortFromFile(fp); /* local header size */ PyMarshal_ReadShortFromFile(fp); /* local header size */
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++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment