From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 2 Dec 2001 12:21:34 +0000 (+0000)
Subject: Patch #486743: remove bad INCREF, propagate exception in append_objects.
X-Git-Tag: v2.2.1c1~622
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=155aad17be54854bea6cafeb5177b19b4cb72bc6;p=python

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

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index f19782bc88..7f8d71a3e6 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;
 }