(original) (raw)

changeset: 84700:d85b0c355052 user: Victor Stinner victor.stinner@gmail.com date: Wed Jul 17 23:01:30 2013 +0200 files: Modules/arraymodule.c description: Issue #18408: Fix array_index(), handle getarrayitem() failure diff -r 3e7683c49620 -r d85b0c355052 Modules/arraymodule.c --- a/Modules/arraymodule.c Wed Jul 17 22:33:42 2013 +0200 +++ b/Modules/arraymodule.c Wed Jul 17 23:01:30 2013 +0200 @@ -968,8 +968,13 @@ Py_ssize_t i; for (i = 0; i < Py_SIZE(self); i++) { - PyObject *selfi = getarrayitem((PyObject *)self, i); - int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); + PyObject *selfi; + int cmp; + + selfi = getarrayitem((PyObject *)self, i); + if (selfi == NULL) + return NULL; + cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); Py_DECREF(selfi); if (cmp > 0) count++; @@ -990,8 +995,13 @@ Py_ssize_t i; for (i = 0; i < Py_SIZE(self); i++) { - PyObject *selfi = getarrayitem((PyObject *)self, i); - int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); + PyObject *selfi; + int cmp; + + selfi = getarrayitem((PyObject *)self, i); + if (selfi == NULL) + return NULL; + cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); Py_DECREF(selfi); if (cmp > 0) { return PyLong_FromLong((long)i); @@ -1016,6 +1026,8 @@ for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(self); i++) { PyObject *selfi = getarrayitem((PyObject *)self, i); + if (selfi == NULL) + return NULL; cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); Py_DECREF(selfi); } @@ -1028,8 +1040,13 @@ int i; for (i = 0; i < Py_SIZE(self); i++) { - PyObject *selfi = getarrayitem((PyObject *)self,i); - int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); + PyObject *selfi; + int cmp; + + selfi = getarrayitem((PyObject *)self,i); + if (selfi == NULL) + return NULL; + cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); Py_DECREF(selfi); if (cmp > 0) { if (array_ass_slice(self, i, i+1, @@ -1068,7 +1085,9 @@ PyErr_SetString(PyExc_IndexError, "pop index out of range"); return NULL; } - v = getarrayitem((PyObject *)self,i); + v = getarrayitem((PyObject *)self, i); + if (v == NULL) + return NULL; if (array_ass_slice(self, i, i+1, (PyObject *)NULL) != 0) { Py_DECREF(v); return NULL; /victor.stinner@gmail.com