bpo-44525: Add recursive checks for CALL_FUNCTION_BUILTIN_O (GH-29271)

python · Oct 28, 2021 · 0a1a36b · 0a1a36b
1 parent f291404
commit 0a1a36b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -4742,8 +4742,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             STAT_INC(CALL_FUNCTION, hit);
 
             PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable);
+            // This is slower but CPython promises to check all non-vectorcall
+            // function calls.
+            if (_Py_EnterRecursiveCall(tstate, " while calling a Python object")) {
+                goto error;
+            }
             PyObject *arg = POP();
             PyObject *res = cfunc(PyCFunction_GET_SELF(callable), arg);
+            _Py_LeaveRecursiveCall(tstate);
             assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
 
             /* Clear the stack of the function object. */