mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #25021: Merge 3.5 to default

Browse source
This commit is contained in:
Kristján Valur Jónsson 2015-09-12 16:36:15 +00:00
commit a8a930f863
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/itertoolsmodule.c
View file

@ -2256,13 +2256,21 @@ product_setstate(productobject *lz, PyObject *state)
{
PyObject* indexObject = PyTuple_GET_ITEM(state, i);
Py_ssize_t index = PyLong_AsSsize_t(indexObject);
PyObject* pool;
Py_ssize_t poolsize;
if (index < 0 && PyErr_Occurred())
return NULL; /* not an integer */
pool = PyTuple_GET_ITEM(lz->pools, i);
poolsize = PyTuple_GET_SIZE(pool);
if (poolsize == 0) {
lz->stopped = 1;
Py_RETURN_NONE;
}
/* clamp the index */
if (index < 0)
index = 0;
else if (index > n-1)
index = n-1;
else if (index > poolsize-1)
index = poolsize-1;
lz->indices[i] = index;
}