GH-102397: Fix segfault from race condition in signal handling (GH-10…

…2399) (cherry picked from commit 1a84cc0) Co-authored-by: Kumar Aditya <[email protected]> Co-authored-by: Gregory P. Smith <[email protected]>
python · Mar 8, 2023 · 7905ae7 · 7905ae7
1 parent 8bf8e3d
commit 7905ae7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
@@ -1413,6 +1413,21 @@ def handler(a, b):
         signal.raise_signal(signal.SIGINT)
         self.assertTrue(is_ok)
 
+    def test__thread_interrupt_main(self):
+        # See https://github.com/python/cpython/issues/102397
+        code = """if 1:
+        import _thread
+        class Foo():
+            def __del__(self):
+                _thread.interrupt_main()
+
+        x = Foo()
+        """
+
+        rc, out, err = assert_python_ok('-c', code)
+        self.assertIn(b'OSError: Signal 2 ignored due to race condition', err)
+
+
 
 class PidfdSignalTest(unittest.TestCase):
 

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-03-04-06-48-34.gh-issue-102397.ACJaOf.rst b/Misc/NEWS.d/next/Core and Builtins/2023-03-04-06-48-34.gh-issue-102397.ACJaOf.rst
@@ -0,0 +1,2 @@
+Fix segfault from race condition in signal handling during garbage collection.
+Patch by Kumar Aditya.
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -181,6 +181,10 @@ get_signal_state(PyObject *module)
 static inline int
 compare_handler(PyObject *func, PyObject *dfl_ign_handler)
 {
+    // See https://github.com/python/cpython/pull/102399
+    if (func == NULL || dfl_ign_handler == NULL) {
+        return 0;
+    }
     assert(PyLong_CheckExact(dfl_ign_handler));
     if (!PyLong_CheckExact(func)) {
         return 0;