summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorKristján Valur Jónsson <sweskman@gmail.com>2014-03-05 15:23:07 (GMT)
committerKristján Valur Jónsson <sweskman@gmail.com>2014-03-05 15:23:07 (GMT)
commitc5cc5011ac33f96a8bf28e3ba088980fd5e71d7a (patch)
tree21c775f7b89e60348ed587d1bb983b2cd61e723b /Modules
parent25ea45db81540b8c589c65edf2564c04461b1f34 (diff)
parent25dded041fe532fcb041b6e68582bf76b4968132 (diff)
downloadcpython-c5cc5011ac33f96a8bf28e3ba088980fd5e71d7a.zip
cpython-c5cc5011ac33f96a8bf28e3ba088980fd5e71d7a.tar.gz
cpython-c5cc5011ac33f96a8bf28e3ba088980fd5e71d7a.tar.bz2
Make the various iterators' "setstate" sliently and consistently clip the
index. This avoids the possibility of setting an iterator to an invalid state.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/arraymodule.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 3b013ac..4a1c158 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -2838,6 +2838,8 @@ arrayiter_setstate(arrayiterobject *it, PyObject *state)
return NULL;
if (index < 0)
index = 0;
+ else if (index > Py_SIZE(it->ao))
+ index = Py_SIZE(it->ao); /* iterator exhausted */
it->index = index;
Py_RETURN_NONE;
}