From d1e5493a26a310a25722af3ad342212d2677672c Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Thu, 2 Apr 2009 02:27:20 +0000 Subject: [PATCH] rewrite error handling to make sense --- Python/symtable.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Python/symtable.c b/Python/symtable.c index 92b223276fc..3c1735ca994 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -824,14 +824,18 @@ analyze_child_block(PySTEntryObject *entry, PyObject *bound, PyObject *free, if (!analyze_block(entry, temp_bound, temp_free, temp_global)) goto error; - success = PyNumber_InPlaceOr(child_free, temp_free) >= 0; + if (PyNumber_InPlaceOr(child_free, temp_free) < 0) + goto error; Py_DECREF(child_free); - success = 1; + 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