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 | 021dec1c96801401d07c8b84cb51115de641bce9 (patch) | |
| tree | 91b684c4d27c648fb7a57bbfdcdc1d514f05440c | |
| parent | 75461e3e2ebefa4a6ef0f191658ce5599e1580a1 (diff) | |
| download | cpython-021dec1c96801401d07c8b84cb51115de641bce9.zip cpython-021dec1c96801401d07c8b84cb51115de641bce9.tar.gz cpython-021dec1c96801401d07c8b84cb51115de641bce9.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 e5225f2..cbb1b92 100644 --- a/Lib/test/test_itertools.py +++ b/Lib/test/test_itertools.py @@ -137,6 +137,11 @@ class TestBasicOps(unittest.TestCase): self.assertEqual(result, list(combinations2(values, r))) # matches second pure python version self.assertEqual(result, list(combinations3(values, r))) # matches second pure python version + @test_support.bigaddrspacetest + def test_combinations_overflow(self): + with self.assertRaises(OverflowError): + combinations("AA", 2**29) + @test_support.impl_detail("tuple reuse is specific to CPython") def test_combinations_tuple_reuse(self): self.assertEqual(len(set(map(id, combinations('abcde', 3)))), 1) @@ -18,6 +18,8 @@ Core and Builtins Library ------- +- Issue #23366: Fixed possible integer overflow in itertools.combinations. + - Issue #23191: fnmatch functions that use caching are now threadsafe. - Issue #18518: timeit now rejects statements which can't be compiled outside diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index cd45eb9..4eab79c 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -2093,6 +2093,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(); |