bpo-44645: Check for interrupts on any potentially backwards edge (GH-27216) (GH-27235)
(cherry picked from commit d09c13417890427f829e3df297beb0e27133f8f4)
Co-authored-by: Mark Shannon <mark@hotpy.org>
diff --git a/Python/ceval.c b/Python/ceval.c
index 6482c88..429ddb8 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3759,14 +3759,17 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
if (Py_IsFalse(cond)) {
Py_DECREF(cond);
JUMPTO(oparg);
+ CHECK_EVAL_BREAKER();
DISPATCH();
}
err = PyObject_IsTrue(cond);
Py_DECREF(cond);
if (err > 0)
;
- else if (err == 0)
+ else if (err == 0) {
JUMPTO(oparg);
+ CHECK_EVAL_BREAKER();
+ }
else
goto error;
DISPATCH();
@@ -3783,12 +3786,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
if (Py_IsTrue(cond)) {
Py_DECREF(cond);
JUMPTO(oparg);
+ CHECK_EVAL_BREAKER();
DISPATCH();
}
err = PyObject_IsTrue(cond);
Py_DECREF(cond);
if (err > 0) {
JUMPTO(oparg);
+ CHECK_EVAL_BREAKER();
}
else if (err == 0)
;