Commit 9ce2bba5 authored by Benjamin Peterson's avatar Benjamin Peterson

check for overflow in combinations_with_replacement (closes #23365)

parent 3e148b34
......@@ -213,6 +213,11 @@ class TestBasicOps(unittest.TestCase):
self.assertEqual(result, list(cwr1(values, r))) # matches first pure python version
self.assertEqual(result, list(cwr2(values, r))) # matches second pure python version
@test_support.bigaddrspacetest
def test_combinations_with_replacement_overflow(self):
with self.assertRaises(OverflowError):
combinations_with_replacement("AA", 2**30)
@test_support.impl_detail("tuple reuse is specific to CPython")
def test_combinations_with_replacement_tuple_reuse(self):
cwr = combinations_with_replacement
......
......@@ -18,6 +18,9 @@ Core and Builtins
Library
-------
- Issue #23365: Fixed possible integer overflow in
itertools.combinations_with_replacement.
- Issue #23366: Fixed possible integer overflow in itertools.combinations.
- Issue #23191: fnmatch functions that use caching are now threadsafe.
......
......@@ -2346,6 +2346,10 @@ cwr_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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment