pythongh-121058: Warn if PyThreadState_Clear is called with an exce…

…ption set (pythongh-121343)
ebonnal · Jan 10, 2025 · d3dde3f · d3dde3f
1 parent 1fe9ace
commit d3dde3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Misc/NEWS.d/next/C API/2024-07-03-13-39-13.gh-issue-121058.MKi1MV.rst b/Misc/NEWS.d/next/C API/2024-07-03-13-39-13.gh-issue-121058.MKi1MV.rst
@@ -0,0 +1,2 @@
+``PyThreadState_Clear()`` now warns (and calls ``sys.excepthook``) if the
+thread state still has an active exception.
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -1649,6 +1649,11 @@ PyThreadState_Clear(PyThreadState *tstate)
           "PyThreadState_Clear: warning: thread still has a frame\n");
     }
 
+    if (verbose && tstate->current_exception != NULL) {
+        fprintf(stderr, "PyThreadState_Clear: warning: thread has an exception set\n");
+        _PyErr_Print(tstate);
+    }
+
     /* At this point tstate shouldn't be used any more,
        neither to run Python code nor for other uses.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		``PyThreadState_Clear()`` now warns (and calls ``sys.excepthook``) if the
		thread state still has an active exception.