From 155aad17be54854bea6cafeb5177b19b4cb72bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 2 Dec 2001 12:21:34 +0000 Subject: [PATCH] Patch #486743: remove bad INCREF, propagate exception in append_objects. --- Modules/gcmodule.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index f19782bc883..7f8d71a3e6b 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -701,17 +701,19 @@ static char gc_get_objects__doc__[] = ; /* appending objects in a GC list to a Python list */ -static void +static int append_objects(PyObject *py_list, PyGC_Head *gc_list) { PyGC_Head *gc; for (gc = gc_list->gc.gc_next; gc != gc_list; gc = gc->gc.gc_next) { PyObject *op = FROM_GC(gc); if (op != py_list) { - Py_INCREF(op); - PyList_Append(py_list, op); + if (PyList_Append(py_list, op)) { + return -1; /* exception */ + } } } + return 0; } static PyObject * @@ -722,9 +724,12 @@ gc_get_objects(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, ":get_objects")) /* check no args */ return NULL; result = PyList_New(0); - append_objects(result, &_PyGC_generation0); - append_objects(result, &generation1); - append_objects(result, &generation2); + if (append_objects(result, &_PyGC_generation0) || + append_objects(result, &generation1) || + append_objects(result, &generation2)) { + Py_DECREF(result); + return NULL; + } return result; }