check for overflow in combinations_with_replacement (closes #23365)

This commit is contained in:
Benjamin Peterson 2015-02-01 21:10:47 -05:00
parent 4b40eeb339
commit 6f082297b2
3 changed files with 12 additions and 1 deletions

View File

@ -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

View File

@ -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?
=========================== ===========================

View File

@ -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();