summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Python/ceval.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 465e03012a..8f0e0e00c2 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4576,12 +4576,15 @@ call_function(PyObject ***pp_stack, Py_ssize_t oparg, PyObject *kwnames)
profiling. */
PyObject *self = stack[0];
func = Py_TYPE(func)->tp_descr_get(func, self, (PyObject*)Py_TYPE(self));
- if (func == NULL) {
- return NULL;
+ if (func != NULL) {
+ C_TRACE(x, _PyCFunction_FastCallKeywords(func,
+ stack+1, nargs-1,
+ kwnames));
+ Py_DECREF(func);
+ }
+ else {
+ x = NULL;
}
- C_TRACE(x, _PyCFunction_FastCallKeywords(func, stack+1, nargs-1,
- kwnames));
- Py_DECREF(func);
}
else {
x = _PyMethodDescr_FastCallKeywords(func, stack, nargs, kwnames);