90c54fba15
All the heavy lifting was done by Tomas Orsava http://pkgs.fedoraproject.org/cgit/rpms/python3.git/commit/?id=6cd1c5f46379304831d14e0590c17b7ee458025b
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From 531dfa4bcfe55d5cd1524425944b07c5b02bddf9 Mon Sep 17 00:00:00 2001
|
|
From: Charalampos Stratakis <cstratak@redhat.com>
|
|
Date: Fri, 8 Jul 2016 17:16:41 +0200
|
|
Subject: [PATCH] CVE-2016-5636 fix
|
|
|
|
---
|
|
Modules/zipimport.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
|
|
index 06abb31..4d0d1de 100644
|
|
--- a/Modules/zipimport.c
|
|
+++ b/Modules/zipimport.c
|
|
@@ -1076,6 +1076,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)
|
|
@@ -1112,6 +1116,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++;
|
|
--
|
|
2.7.4
|
|
|