mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 3.3 (#23366)

Browse source
This commit is contained in:
Benjamin Peterson 2015-02-01 21:00:15 -05:00
commit 819c4e9bc4
3 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_itertools.py
View file

@ -264,6 +264,11 @@ class TestBasicOps(unittest.TestCase):
for proto in range(pickle.HIGHEST_PROTOCOL + 1): for proto in range(pickle.HIGHEST_PROTOCOL + 1):
self.pickletest(proto, combinations(values, r)) # test pickling 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 # 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):

2
Misc/NEWS
View file

@ -50,6 +50,8 @@ Core and Builtins
Library Library
------- -------
- Issue #23366: Fixed possible integer overflow in itertools.combinations.
- Issue #23369: Fixed possible integer overflow in - Issue #23369: Fixed possible integer overflow in
_json.encode_basestring_ascii. _json.encode_basestring_ascii.

4
Modules/itertoolsmodule.c
View file

@ -2359,6 +2359,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();