From 6946ea0be032c17689ee35d3281060b8fe662471 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 9 Jun 2006 22:45:54 +0000 Subject: [PATCH] Fix bug introduced in rev. 46806 by not having variable declaration at the top of a block. --- Objects/abstract.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Objects/abstract.c b/Objects/abstract.c index 53898c5990..e85fe20872 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1790,14 +1790,16 @@ PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) ternaryfunc call; if ((call = func->ob_type->tp_call) != NULL) { + PyObject *result = NULL; /* slot_tp_call() will be called and ends up calling PyObject_Call() if the object returned for __call__ has __call__ itself defined upon it. This can be an infinite recursion if you set __call__ in a class to an instance of it. */ - if (Py_EnterRecursiveCall(" in __call__")) + if (Py_EnterRecursiveCall(" in __call__")) { return NULL; - PyObject *result = (*call)(func, arg, kw); + } + result = (*call)(func, arg, kw); Py_LeaveRecursiveCall(); if (result == NULL && !PyErr_Occurred()) PyErr_SetString( -- 2.50.1