mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 19:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Patch #486743: remove bad INCREF, propagate exception in append_objects.

Browse source
This commit is contained in:
Martin v. Löwis 2001-12-02 12:21:34 +00:00
parent 8b6bd42e08
commit 155aad17be
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/gcmodule.c
View file

@ -701,18 +701,20 @@ static char gc_get_objects__doc__[] =
; ;
/* appending objects in a GC list to a Python list */ /* appending objects in a GC list to a Python list */
static void static int
append_objects(PyObject *py_list, PyGC_Head *gc_list) append_objects(PyObject *py_list, PyGC_Head *gc_list)
{ {
PyGC_Head *gc; PyGC_Head *gc;
for (gc = gc_list->gc.gc_next; gc != gc_list; gc = gc->gc.gc_next) { for (gc = gc_list->gc.gc_next; gc != gc_list; gc = gc->gc.gc_next) {
PyObject *op = FROM_GC(gc); PyObject *op = FROM_GC(gc);
if (op != py_list) { if (op != py_list) {
Py_INCREF(op); if (PyList_Append(py_list, op)) {
PyList_Append(py_list, op); return -1; /* exception */
} }
} }
} }
return 0;
}
static PyObject * static PyObject *
gc_get_objects(PyObject *self, PyObject *args) gc_get_objects(PyObject *self, PyObject *args)
@ -722,9 +724,12 @@ gc_get_objects(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, ":get_objects")) /* check no args */ if (!PyArg_ParseTuple(args, ":get_objects")) /* check no args */
return NULL; return NULL;
result = PyList_New(0); result = PyList_New(0);
append_objects(result, &_PyGC_generation0); if (append_objects(result, &_PyGC_generation0) ||
append_objects(result, &generation1); append_objects(result, &generation1) ||
append_objects(result, &generation2); append_objects(result, &generation2)) {
Py_DECREF(result);
return NULL;
}
return result; return result;
} }