(original) (raw)

changeset: 89477:3b2c28061184 branch: 3.3 parent: 89475:24d4e52f4f87 user: Kristján Valur Jónsson sweskman@gmail.com date: Wed Mar 05 13:47:57 2014 +0000 files: Lib/test/test_range.py Modules/arraymodule.c Objects/bytearrayobject.c Objects/bytesobject.c Objects/listobject.c Objects/rangeobject.c Objects/tupleobject.c Objects/unicodeobject.c description: Make the various iterators' "setstate" sliently and consistently clip the index. This avoids the possibility of setting an iterator to an invalid state. diff -r 24d4e52f4f87 -r 3b2c28061184 Lib/test/test_range.py --- a/Lib/test/test_range.py Tue Mar 04 23:19:24 2014 +0000 +++ b/Lib/test/test_range.py Wed Mar 05 13:47:57 2014 +0000 @@ -380,6 +380,18 @@ self.assertEqual(list(it), data[1:]) def test_exhausted_iterator_pickling(self): + r = range(2**65, 2**65+2) + i = iter(r) + while True: + r = next(i) + if r == 2**65+1: + break + d = pickle.dumps(i) + i2 = pickle.loads(d) + self.assertEqual(list(i), []) + self.assertEqual(list(i2), []) + + def test_large_exhausted_iterator_pickling(self): r = range(20) i = iter(r) while True: diff -r 24d4e52f4f87 -r 3b2c28061184 Modules/arraymodule.c --- a/Modules/arraymodule.c Tue Mar 04 23:19:24 2014 +0000 +++ b/Modules/arraymodule.c Wed Mar 05 13:47:57 2014 +0000 @@ -2798,6 +2798,8 @@ 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; } diff -r 24d4e52f4f87 -r 3b2c28061184 Objects/bytearrayobject.c --- a/Objects/bytearrayobject.c Tue Mar 04 23:19:24 2014 +0000 +++ b/Objects/bytearrayobject.c Wed Mar 05 13:47:57 2014 +0000 @@ -3043,9 +3043,13 @@ Py_ssize_t index = PyLong_AsSsize_t(state); if (index == -1 && PyErr_Occurred()) return NULL; - if (index < 0) - index = 0; - it->it_index = index; + if (it->it_seq != NULL) { + if (index < 0) + index = 0; + else if (index > PyByteArray_GET_SIZE(it->it_seq)) + index = PyByteArray_GET_SIZE(it->it_seq); /* iterator exhausted */ + it->it_index = index; + } Py_RETURN_NONE; } diff -r 24d4e52f4f87 -r 3b2c28061184 Objects/bytesobject.c --- a/Objects/bytesobject.c Tue Mar 04 23:19:24 2014 +0000 +++ b/Objects/bytesobject.c Wed Mar 05 13:47:57 2014 +0000 @@ -2996,9 +2996,13 @@ Py_ssize_t index = PyLong_AsSsize_t(state); if (index == -1 && PyErr_Occurred()) return NULL; - if (index < 0) - index = 0; - it->it_index = index; + if (it->it_seq != NULL) { + if (index < 0) + index = 0; + else if (index > PyBytes_GET_SIZE(it->it_seq)) + index = PyBytes_GET_SIZE(it->it_seq); /* iterator exhausted */ + it->it_index = index; + } Py_RETURN_NONE; } diff -r 24d4e52f4f87 -r 3b2c28061184 Objects/listobject.c --- a/Objects/listobject.c Tue Mar 04 23:19:24 2014 +0000 +++ b/Objects/listobject.c Wed Mar 05 13:47:57 2014 +0000 @@ -2803,6 +2803,8 @@ if (it->it_seq != NULL) { if (index < 0) index = 0; + else if (index > PyList_GET_SIZE(it->it_seq)) + index = PyList_GET_SIZE(it->it_seq); /* iterator exhausted */ it->it_index = index; } Py_RETURN_NONE; diff -r 24d4e52f4f87 -r 3b2c28061184 Objects/rangeobject.c --- a/Objects/rangeobject.c Tue Mar 04 23:19:24 2014 +0000 +++ b/Objects/rangeobject.c Wed Mar 05 13:47:57 2014 +0000 @@ -1000,10 +1000,11 @@ long index = PyLong_AsLong(state); if (index == -1 && PyErr_Occurred()) return NULL; - if (index < 0 || index > r->len) { - PyErr_SetString(PyExc_ValueError, "index out of range"); - return NULL; - } + /* silently clip the index value */ + if (index < 0) + index = 0; + else if (index > r->len) + index = r->len; /* exhausted iterator */ r->index = index; Py_RETURN_NONE; } @@ -1178,6 +1179,28 @@ static PyObject * longrangeiter_setstate(longrangeiterobject *r, PyObject *state) { + int cmp; + + /* clip the value */ + PyObject *zero = PyLong_FromLong(0); + if (zero == NULL) + return NULL; + cmp = PyObject_RichCompareBool(state, zero, Py_LT); + if (cmp > 0) { + Py_CLEAR(r->index); + r->index = zero; + Py_RETURN_NONE; + } + Py_DECREF(zero); + if (cmp < 0) + return NULL; + + cmp = PyObject_RichCompareBool(r->len, state, Py_LT); + if (cmp < 0) + return NULL; + if (cmp > 0) + state = r->len; + Py_CLEAR(r->index); r->index = state; Py_INCREF(r->index); diff -r 24d4e52f4f87 -r 3b2c28061184 Objects/tupleobject.c --- a/Objects/tupleobject.c Tue Mar 04 23:19:24 2014 +0000 +++ b/Objects/tupleobject.c Wed Mar 05 13:47:57 2014 +0000 @@ -998,8 +998,8 @@ if (it->it_seq != NULL) { if (index < 0) index = 0; - else if (it->it_seq != NULL && index > PyTuple_GET_SIZE(it->it_seq)) - index = PyTuple_GET_SIZE(it->it_seq); + else if (index > PyTuple_GET_SIZE(it->it_seq)) + index = PyTuple_GET_SIZE(it->it_seq); /* exhausted iterator */ it->it_index = index; } Py_RETURN_NONE; diff -r 24d4e52f4f87 -r 3b2c28061184 Objects/unicodeobject.c --- a/Objects/unicodeobject.c Tue Mar 04 23:19:24 2014 +0000 +++ b/Objects/unicodeobject.c Wed Mar 05 13:47:57 2014 +0000 @@ -14420,9 +14420,13 @@ Py_ssize_t index = PyLong_AsSsize_t(state); if (index == -1 && PyErr_Occurred()) return NULL; - if (index < 0) - index = 0; - it->it_index = index; + if (it->it_seq != NULL) { + if (index < 0) + index = 0; + else if (index > PyUnicode_GET_LENGTH(it->it_seq)) + index = PyUnicode_GET_LENGTH(it->it_seq); /* iterator truncated */ + it->it_index = index; + } Py_RETURN_NONE; } /sweskman@gmail.com