Commit 6f082297 authored by Benjamin Peterson's avatar Benjamin Peterson

check for overflow in combinations_with_replacement (closes #23365)

parent 4b40eeb3
...@@ -344,8 +344,12 @@ class TestBasicOps(unittest.TestCase): ...@@ -344,8 +344,12 @@ class TestBasicOps(unittest.TestCase):
self.pickletest(cwr(values,r)) # test pickling self.pickletest(cwr(values,r)) # test pickling
# Test implementation detail: tuple re-use @support.bigaddrspacetest
def test_combinations_with_replacement_overflow(self):
with self.assertRaises(OverflowError):
combinations_with_replacement("AA", 2**30)
# Test implementation detail: tuple re-use
@support.impl_detail("tuple reuse is specific to CPython") @support.impl_detail("tuple reuse is specific to CPython")
def test_combinations_with_replacement_tuple_reuse(self): def test_combinations_with_replacement_tuple_reuse(self):
cwr = combinations_with_replacement cwr = combinations_with_replacement
......
...@@ -21,6 +21,9 @@ Library ...@@ -21,6 +21,9 @@ Library
- Issue #23366: Fixed possible integer overflow in itertools.combinations. - Issue #23366: Fixed possible integer overflow in itertools.combinations.
- Issue #23365: Fixed possible integer overflow in
itertools.combinations_with_replacement.
What's New in Python 3.3.6? What's New in Python 3.3.6?
=========================== ===========================
......
...@@ -2659,6 +2659,10 @@ cwr_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -2659,6 +2659,10 @@ cwr_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
goto error; 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)); indices = PyMem_Malloc(r * sizeof(Py_ssize_t));
if (indices == NULL) { if (indices == NULL) {
PyErr_NoMemory(); 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