diff options
| author | Raymond Hettinger <python@rcn.com> | 2010-11-30 03:15:35 +0000 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2010-11-30 03:15:35 +0000 |
| commit | 061bf7a11a390c70dc6660691518241679a1698e (patch) | |
| tree | 6905cd12a19a363b9c9985c337e977f110c82a62 /Modules/itertoolsmodule.c | |
| parent | 1fea5c4472b29fff85ae40a8d7f0c845347ad5c6 (diff) | |
| download | cpython-git-061bf7a11a390c70dc6660691518241679a1698e.tar.gz | |
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 c6d92eafc9..ff25335c04 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; } |