detect overflow in combinations (closes #23366)

This commit is contained in:
Benjamin Peterson 2015-02-01 20:59:00 -05:00
parent 68389eaa3f
commit 4b40eeb339
3 changed files with 11 additions and 0 deletions

View File

@ -258,6 +258,11 @@ class TestBasicOps(unittest.TestCase):
self.pickletest(combinations(values, r)) # test pickling 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 # 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_tuple_reuse(self): def test_combinations_tuple_reuse(self):

View File

@ -19,6 +19,8 @@ Library
- Issue #23369: Fixed possible integer overflow in - Issue #23369: Fixed possible integer overflow in
_json.encode_basestring_ascii. _json.encode_basestring_ascii.
- Issue #23366: Fixed possible integer overflow in itertools.combinations.
What's New in Python 3.3.6? What's New in Python 3.3.6?
=========================== ===========================

View File

@ -2326,6 +2326,10 @@ combinations_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();