From: Georg Brandl <georg@python.org>
Date: Tue, 19 Jul 2005 22:20:44 +0000 (+0000)
Subject: Backport: fix cleanup DECREF logic in builtin_filter function.
X-Git-Tag: v2.4.2c1~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ccd18e3df7e0c5152eda6289a4f859252053dd2;p=thirdparty%2FPython%2Fcpython.git

Backport: fix cleanup DECREF logic in builtin_filter function.
---

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 6fbe799f7113..8dd3f1cbb930 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -147,10 +147,15 @@ builtin_filter(PyObject *self, PyObject *args)
 	if (PyTuple_Check(seq))
 		return filtertuple(func, seq);
 
+	/* Pre-allocate argument list tuple. */
+	arg = PyTuple_New(1);
+	if (arg == NULL)
+		return NULL;
+
 	/* Get iterator. */
 	it = PyObject_GetIter(seq);
 	if (it == NULL)
-		return NULL;
+		goto Fail_arg;
 
 	/* Guess a result list size. */
 	len = PyObject_Size(seq);
@@ -159,11 +164,6 @@ builtin_filter(PyObject *self, PyObject *args)
 		len = 8;	/* arbitrary */
 	}
 
-	/* Pre-allocate argument list tuple. */
-	arg = PyTuple_New(1);
-	if (arg == NULL)
-		goto Fail_arg;
-
 	/* Get a result list. */
 	if (PyList_Check(seq) && seq->ob_refcnt == 1) {
 		/* Eww - can modify the list in-place. */