diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-02-02 01:59:00 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-02-02 01:59:00 (GMT) |
| commit | 4b40eeb33901c3a520ce78ae88eb5ee06870130f (patch) | |
| tree | e341d3e92baecda546e00b8591d835f59c6c2db5 | |
| parent | 68389eaa3f9cbba8654e0121d4787e5099babd77 (diff) | |
| download | cpython-4b40eeb33901c3a520ce78ae88eb5ee06870130f.zip cpython-4b40eeb33901c3a520ce78ae88eb5ee06870130f.tar.gz cpython-4b40eeb33901c3a520ce78ae88eb5ee06870130f.tar.bz2 | |
detect overflow in combinations (closes #23366)
| -rw-r--r-- | Lib/test/test_itertools.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | 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 index 514a6b7..2475443 100644 --- a/Lib/test/test_itertools.py +++ b/Lib/test/test_itertools.py @@ -258,6 +258,11 @@ class TestBasicOps(unittest.TestCase): self.pickletest(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): @@ -19,6 +19,8 @@ Library - Issue #23369: Fixed possible integer overflow in _json.encode_basestring_ascii. +- Issue #23366: Fixed possible integer overflow in itertools.combinations. + What's New in Python 3.3.6? =========================== diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 0123181..5805143 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -2326,6 +2326,10 @@ combinations_new(PyTypeObject *type, PyObject *args, PyObject *kwds) 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(); |