diff options
| author | Kristján Valur Jónsson <sweskman@gmail.com> | 2015-09-12 16:34:33 (GMT) |
|---|---|---|
| committer | Kristján Valur Jónsson <sweskman@gmail.com> | 2015-09-12 16:34:33 (GMT) |
| commit | d7f65e5763fdf16afa0dc786bcc3e40024037aaf (patch) | |
| tree | 34157c34c5f4ff522c70aadda39ac05626cae6fe /Modules/itertoolsmodule.c | |
| parent | 153627c111d755ad45c4699755fd64d89ac2eb66 (diff) | |
| parent | 95c3e6cb2243acc0a102d9fa59efece1427a3936 (diff) | |
| download | cpython-d7f65e5763fdf16afa0dc786bcc3e40024037aaf.zip cpython-d7f65e5763fdf16afa0dc786bcc3e40024037aaf.tar.gz cpython-d7f65e5763fdf16afa0dc786bcc3e40024037aaf.tar.bz2 | |
Issue #25021: Merge 3.4 to 3.5
Diffstat (limited to 'Modules/itertoolsmodule.c')
| -rw-r--r-- | Modules/itertoolsmodule.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index ac31e2f..16ac2fb 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -2236,13 +2236,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; } |