diff options
| author | Raymond Hettinger <python@rcn.com> | 2010-11-30 02:49:29 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2010-11-30 02:49:29 (GMT) |
| commit | 69b34bfe9c3e5da1d7336a607ab56f1c3a178dca (patch) | |
| tree | 99a57401cce528c9fd1e50b67dcc81b27eafeaba /Modules/itertoolsmodule.c | |
| parent | ac9a2bb06762cb42881a1babc4e21f7cb656be62 (diff) | |
| download | cpython-69b34bfe9c3e5da1d7336a607ab56f1c3a178dca.zip cpython-69b34bfe9c3e5da1d7336a607ab56f1c3a178dca.tar.gz cpython-69b34bfe9c3e5da1d7336a607ab56f1c3a178dca.tar.bz2 | |
Issue #10323: Predictable final state for slice().
Diffstat (limited to 'Modules/itertoolsmodule.c')
| -rw-r--r-- | Modules/itertoolsmodule.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index ba8d6df..d5336f2 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -1215,6 +1215,7 @@ islice_next(isliceobject *lz) { PyObject *item; PyObject *it = lz->it; + Py_ssize_t stop = lz->stop; Py_ssize_t oldnext; PyObject *(*iternext)(PyObject *); @@ -1226,7 +1227,7 @@ islice_next(isliceobject *lz) Py_DECREF(item); lz->cnt++; } - if (lz->stop != -1 && lz->cnt >= lz->stop) + if (stop != -1 && lz->cnt >= stop) return NULL; item = iternext(it); if (item == NULL) @@ -1234,8 +1235,8 @@ islice_next(isliceobject *lz) lz->cnt++; oldnext = lz->next; lz->next += lz->step; - if (lz->next < oldnext) /* Check for overflow */ - lz->next = lz->stop; + if (lz->next < oldnext || (stop != -1 && lz->next > stop)) + lz->next = stop; return item; } |