From 0ff0f54dd498170d5698132d24deeeaaab9bf5df Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 8 Jul 2013 22:27:42 +0200 Subject: [PATCH] Issue #18408: Fix call_function() of ceval.c to handle PyTuple_New() failure (in load_args()), ex: MemoryError. --- Python/ceval.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Python/ceval.c b/Python/ceval.c index e184ef6a4b..82e85ca95d 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4171,10 +4171,15 @@ call_function(PyObject ***pp_stack, int oparg else { PyObject *callargs; callargs = load_args(pp_stack, na); - READ_TIMESTAMP(*pintr0); - C_TRACE(x, PyCFunction_Call(func,callargs,NULL)); - READ_TIMESTAMP(*pintr1); - Py_XDECREF(callargs); + if (callargs != NULL) { + READ_TIMESTAMP(*pintr0); + C_TRACE(x, PyCFunction_Call(func,callargs,NULL)); + READ_TIMESTAMP(*pintr1); + Py_XDECREF(callargs); + } + else { + x = NULL; + } } } else { if (PyMethod_Check(func) && PyMethod_GET_SELF(func) != NULL) { -- 2.50.0