gh-111375: Use NULL rather than None in the exception stack to indicate that an exception was handled (#113302)

2023-12-20 20:46:41 -05:00
parent 1ff0238594
commit a2dd0e7038
6 changed files with 9 additions and 7 deletions
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -1100,7 +1100,7 @@ dummy_func(

        inst(POP_EXCEPT, (exc_value -- )) {
            _PyErr_StackItem *exc_info = tstate->exc_info;
-            Py_XSETREF(exc_info->exc_value, exc_value);
+            Py_XSETREF(exc_info->exc_value, exc_value == Py_None ? NULL : exc_value);
        }

        inst(RERAISE, (values[oparg], exc -- values[oparg])) {