From b76c7502d04f54afda949de6d5c940efe4d23a17 Mon Sep 17 00:00:00 2001 From: Stan Ulbrych Date: Mon, 29 Jun 2026 11:06:04 +0200 Subject: [PATCH] gh-152375: Fix undefined behaviour in the `INSTRUMENTED_JUMP` macro (GH-152376) (cherry picked from commit cdec9acd63c33d9b822700de8f63eb94d86e1c93) Co-authored-by: Stan Ulbrych --- .../2026-06-27-10-05-12.gh-issue-152375.L-ZBk6.rst | 2 ++ Python/ceval_macros.h | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2026-06-27-10-05-12.gh-issue-152375.L-ZBk6.rst diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-06-27-10-05-12.gh-issue-152375.L-ZBk6.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-27-10-05-12.gh-issue-152375.L-ZBk6.rst new file mode 100644 index 000000000000000..db6ae3060d8328f --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-27-10-05-12.gh-issue-152375.L-ZBk6.rst @@ -0,0 +1,2 @@ +Fix undefined behaviour when a :mod:`sys.monitoring` callback raised an +exception while the program was following a branch or loop. diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h index 4a878d6dff4353b..95a8e719d4d0d1c 100644 --- a/Python/ceval_macros.h +++ b/Python/ceval_macros.h @@ -320,14 +320,15 @@ GETITEM(PyObject *v, Py_ssize_t i) { // for an exception handler, displaying the traceback, and so on #define INSTRUMENTED_JUMP(src, dest, event) \ do { \ + _Py_CODEUNIT *_dest = (dest); \ if (tstate->tracing) {\ - next_instr = dest; \ + next_instr = _dest; \ } else { \ _PyFrame_SetStackPointer(frame, stack_pointer); \ - next_instr = _Py_call_instrumentation_jump(this_instr, tstate, event, frame, src, dest); \ + next_instr = _Py_call_instrumentation_jump(this_instr, tstate, event, frame, src, _dest); \ stack_pointer = _PyFrame_GetStackPointer(frame); \ if (next_instr == NULL) { \ - next_instr = (dest)+1; \ + next_instr = _dest + 1; \ JUMP_TO_LABEL(error); \ } \ } \