From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Apr 2009 02:52:46 +0000 (+0000)
Subject: fix error handling
X-Git-Tag: v2.7a1~1608
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=985951df7f05b8206c5c928a7783326ea942a874;p=python

fix error handling
---

diff --git a/Python/symtable.c b/Python/symtable.c
index 514ed44a7f..023c93398d 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -732,7 +732,6 @@ analyze_child_block(PySTEntryObject *entry, PyObject *bound, PyObject *free,
 		    PyObject *global, PyObject* child_free)
 {
 	PyObject *temp_bound = NULL, *temp_global = NULL, *temp_free = NULL;
-	int success = 0;
 
 	/* Copy the bound and global dictionaries.
 
@@ -759,13 +758,17 @@ analyze_child_block(PySTEntryObject *entry, PyObject *bound, PyObject *free,
 
 	if (!analyze_block(entry, temp_bound, temp_free, temp_global))
 		goto error;
-	success = PyDict_Update(child_free, temp_free) >= 0;
-	success = 1;
+	if (PyDict_Update(child_free, temp_free) < 0)
+		goto error;
+	Py_DECREF(temp_bound);
+	Py_DECREF(temp_free);
+	Py_DECREF(temp_global);
+	return 1;
  error:
 	Py_XDECREF(temp_bound);
 	Py_XDECREF(temp_free);
 	Py_XDECREF(temp_global);
-	return success;
+	return 0;
 }
 
 static int