Issue #18408: Fix call_function() of ceval.c to handle PyTuple_New() failure

(in load_args()), ex: MemoryError.

Issue #18408: Fix call_function() of ceval.c to handle PyTuple_New() failure
(in load_args()), ex: MemoryError.
0ff0f54d · Victor Stinner · 9812af8e · 0ff0f54d
Commit 0ff0f54d authored Jul 08, 2013 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

Python/ceval.c Python/ceval.c +9 -4

No files found.
--- 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);
+            if (callargs != NULL) {
-            C_TRACE(x, PyCFunction_Call(func,callargs,NULL));
+                READ_TIMESTAMP(*pintr0);
-            READ_TIMESTAMP(*pintr1);
+                C_TRACE(x, PyCFunction_Call(func,callargs,NULL));
-            Py_XDECREF(callargs);
+                READ_TIMESTAMP(*pintr1);
+                Py_XDECREF(callargs);
+            }
+            else {
+                x = NULL;
+            }
        }
    } else {
        if (PyMethod_Check(func) && PyMethod_GET_SELF(func) != NULL) {