bpo-40826: PyOS_InterruptOccurred() requires GIL (GH-20578)

vstinner · web-flow · commit cbe129692293 · 2020-06-01T20:34:15.000+02:00
PyOS_InterruptOccurred() now fails with a fatal error if it is called
with the GIL released.
diff --git a/Misc/NEWS.d/next/C API/2020-06-01-16-12-37.bpo-40826.zQzFoK.rst b/Misc/NEWS.d/next/C API/2020-06-01-16-12-37.bpo-40826.zQzFoK.rst
@@ -0,0 +1,2 @@
+:c:func:`PyOS_InterruptOccurred` now fails with a fatal error if it is
+called with the GIL released.
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -1782,8 +1782,9 @@ PyOS_FiniInterrupts(void)
 int
 PyOS_InterruptOccurred(void)
 {
-    PyInterpreterState *interp = _PyInterpreterState_GET();
-    if (!_Py_ThreadCanHandleSignals(interp)) {
+    PyThreadState *tstate = _PyThreadState_GET();
+    _Py_EnsureTstateNotNULL(tstate);
+    if (!_Py_ThreadCanHandleSignals(tstate->interp)) {
         return 0;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+:c:func:`PyOS_InterruptOccurred` now fails with a fatal error if it is
	`2`	`+called with the GIL released.`
Original file line number	Diff line number	Diff line change
`@@ -1782,8 +1782,9 @@ PyOS_FiniInterrupts(void)`
`1782`	`1782`	`int`
`1783`	`1783`	`PyOS_InterruptOccurred(void)`
`1784`	`1784`	`{`
`1785`		`- PyInterpreterState *interp = _PyInterpreterState_GET();`
`1786`		`- if (!_Py_ThreadCanHandleSignals(interp)) {`
	`1785`	`+ PyThreadState *tstate = _PyThreadState_GET();`
	`1786`	`+ _Py_EnsureTstateNotNULL(tstate);`
	`1787`	`+ if (!_Py_ThreadCanHandleSignals(tstate->interp)) {`
`1787`	`1788`	`return 0;`
`1788`	`1789`	`}`
`1789`	`1790`