mirror of https://github.com/python/cpython
merge 3.4 (#23366)
This commit is contained in:
commit
4db56d5002
|
@ -264,6 +264,11 @@ class TestBasicOps(unittest.TestCase):
|
|||
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
|
||||
self.pickletest(proto, 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
|
||||
@support.impl_detail("tuple reuse is specific to CPython")
|
||||
def test_combinations_tuple_reuse(self):
|
||||
|
|
|
@ -229,6 +229,8 @@ Library
|
|||
- Issue #23326: Removed __ne__ implementations. Since fixing default __ne__
|
||||
implementation in issue #21408 they are redundant.
|
||||
|
||||
- Issue #23366: Fixed possible integer overflow in itertools.combinations.
|
||||
|
||||
- Issue #23369: Fixed possible integer overflow in
|
||||
_json.encode_basestring_ascii.
|
||||
|
||||
|
|
|
@ -2359,6 +2359,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();
|
||||
|
|
Loading…
Reference in New Issue