From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Apr 2009 02:58:49 +0000 (+0000)
Subject: Merged revisions 71026 via svnmerge from
X-Git-Tag: v2.6.2c1~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=945e052accebd4ae920c4d4444f8ccee0c82a32d;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 71026 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71026 | benjamin.peterson | 2009-04-01 21:52:46 -0500 (Wed, 01 Apr 2009) | 1 line

  fix error handling
........
---

diff --git a/Python/symtable.c b/Python/symtable.c
index 1871a420d9e6..e0b28c9e0d00 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -731,7 +731,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.
 
@@ -758,13 +757,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