traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #18408: Fix array_tolist(), handle PyList_SetItem() failure

This commit is contained in:
Victor Stinner 2013-07-18 01:12:35 +02:00
parent 0b142e2809
commit 4755beac3c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Modules/arraymodule.c
View File

@ -1027,7 +1027,7 @@ array_contains(arrayobject *self, PyObject *v)
for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(self); i++) {
PyObject *selfi = getarrayitem((PyObject *)self, i);
if (selfi == NULL)
return NULL;
return -1;
cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
Py_DECREF(selfi);
}
@ -1405,13 +1405,16 @@ array_tolist(arrayobject *self, PyObject *unused)
return NULL;
for (i = 0; i < Py_SIZE(self); i++) {
PyObject *v = getarrayitem((PyObject *)self, i);
if (v == NULL) {
Py_DECREF(list);
return NULL;
}
PyList_SetItem(list, i, v);
if (v == NULL)
goto error;
if (PyList_SetItem(list, i, v) < 0)
goto error;
}
return list;
error:
Py_DECREF(list);
return NULL;
}
PyDoc_STRVAR(tolist_doc,