[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#23366)

Mon Feb 2 03:05:12 CET 2015

https://hg.python.org/cpython/rev/886559229911
changeset: 94450:886559229911
parent: 94447:3231a13a0c82
parent: 94449:2f73de7ffcf5
user: Benjamin Peterson <benjamin at python.org>
date: Sun Feb 01 21:01:43 2015 -0500
summary:
 merge 3.4 (#23366)
files:
 Lib/test/test_itertools.py | 5 +++++
 Misc/NEWS | 2 ++
 Modules/itertoolsmodule.c | 4 ++++
 3 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
--- a/Lib/test/test_itertools.py
+++ b/Lib/test/test_itertools.py
@@ -264,6 +264,11 @@
 for proto in range(pickle.HIGHEST_PROTOCOL + 1):
 self.pickletest(proto, combinations(values, r)) # test pickling
 
+ @support.bigaddrspacetest
+ def test_combinations_overflow(self):
+ with self.assertRaises(OverflowError):
+ combinations("AA", 2**29)
+
 # Test implementation detail: tuple re-use
 @support.impl_detail("tuple reuse is specific to CPython")
 def test_combinations_tuple_reuse(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -229,6 +229,8 @@
 - Issue #23326: Removed __ne__ implementations. Since fixing default __ne__
 implementation in issue #21408 they are redundant.
 
+- Issue #23366: Fixed possible integer overflow in itertools.combinations.
+
 - Issue #23369: Fixed possible integer overflow in
 _json.encode_basestring_ascii.
 
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -2359,6 +2359,10 @@
 goto error;
 }
 
+ if (r > PY_SSIZE_T_MAX/sizeof(Py_ssize_t)) {
+ PyErr_SetString(PyExc_OverflowError, "r is too big");
+ goto error;
+ }
 indices = PyMem_Malloc(r * sizeof(Py_ssize_t));
 if (indices == NULL) {
 PyErr_NoMemory();
-- 
Repository URL: https://hg.python.org/cpython
