diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-06-24 21:59:24 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-06-24 21:59:24 (GMT) |
| commit | 7660b880a583442af8ad9d5c91ce608abd4b9654 (patch) | |
| tree | a239520f616ecf076365a81f3310b02b0808db03 | |
| parent | 9a644b23cc5ab83fc56ea18dceb4c3b34e653f73 (diff) | |
| download | cpython-7660b880a583442af8ad9d5c91ce608abd4b9654.zip cpython-7660b880a583442af8ad9d5c91ce608abd4b9654.tar.gz cpython-7660b880a583442af8ad9d5c91ce608abd4b9654.tar.bz2 | |
Issue #9566: More long/Py_ssize_t fixes in tuple and list iterators (it_index)
| -rw-r--r-- | Objects/listobject.c | 6 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index 4cc34b5..0c82cc4 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2660,7 +2660,7 @@ PyTypeObject PyList_Type = { typedef struct { PyObject_HEAD - long it_index; + Py_ssize_t it_index; PyListObject *it_seq; /* Set to NULL when iterator is exhausted */ } listiterobject; @@ -2797,7 +2797,7 @@ listiter_reduce(listiterobject *it) static PyObject * listiter_setstate(listiterobject *it, PyObject *state) { - long index = PyLong_AsLong(state); + Py_ssize_t index = PyLong_AsSsize_t(state); if (index == -1 && PyErr_Occurred()) return NULL; if (it->it_seq != NULL) { @@ -2958,7 +2958,7 @@ listiter_reduce_general(void *_it, int forward) if (forward) { listiterobject *it = (listiterobject *)_it; if (it->it_seq) - return Py_BuildValue("N(O)l", _PyObject_GetBuiltin("iter"), + return Py_BuildValue("N(O)n", _PyObject_GetBuiltin("iter"), it->it_seq, it->it_index); } else { listreviterobject *it = (listreviterobject *)_it; diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index de43ee4..52896b7 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -988,7 +988,7 @@ static PyObject * tupleiter_reduce(tupleiterobject *it) { if (it->it_seq) - return Py_BuildValue("N(O)l", _PyObject_GetBuiltin("iter"), + return Py_BuildValue("N(O)n", _PyObject_GetBuiltin("iter"), it->it_seq, it->it_index); else return Py_BuildValue("N(())", _PyObject_GetBuiltin("iter")); @@ -997,7 +997,7 @@ tupleiter_reduce(tupleiterobject *it) static PyObject * tupleiter_setstate(tupleiterobject *it, PyObject *state) { - Py_ssize_t index = PyLong_AsLong(state); + Py_ssize_t index = PyLong_AsSsize_t(state); if (index == -1 && PyErr_Occurred()) return NULL; if (it->it_seq != NULL) { |