(original) (raw)

changeset: 84513:f4311870e329 user: Victor Stinner victor.stinner@gmail.com date: Mon Jul 08 22:27:42 2013 +0200 files: Python/ceval.c description: Issue #18408: Fix call_function() of ceval.c to handle PyTuple_New() failure (in load_args()), ex: MemoryError. diff -r de1473f4503b -r f4311870e329 Python/ceval.c --- a/Python/ceval.c Mon Jul 08 22:25:48 2013 +0200 +++ b/Python/ceval.c Mon Jul 08 22:27:42 2013 +0200 @@ -4171,10 +4171,15 @@ 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) { /victor.stinner@gmail.com