diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-01-21 06:25:06 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-01-21 06:25:06 (GMT) |
| commit | 47b8ba22e304fa136563c803f5f0cc589e8be1ac (patch) | |
| tree | ec367ffa5e950c78580061122983de29fe3d12b0 /Modules | |
| parent | d4d7737c3f294d745d6c121dabb17b76cc11b9c8 (diff) | |
| parent | c4032da2012d75c6c358f74d8bf9ee98a7fe8ecf (diff) | |
| download | cpython-47b8ba22e304fa136563c803f5f0cc589e8be1ac.zip cpython-47b8ba22e304fa136563c803f5f0cc589e8be1ac.tar.gz cpython-47b8ba22e304fa136563c803f5f0cc589e8be1ac.tar.bz2 | |
merge 3.4 (#26171)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/zipimport.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/zipimport.c b/Modules/zipimport.c index 42f8f16..fa60aa9 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -1127,6 +1127,11 @@ get_data(PyObject *archive, PyObject *toc_entry) } 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++; |