bpo-35724: Explicitly require the main interpreter for signal-handling. (GH-11530)

Ensure that the main interpreter is active (in the main thread) for signal-handling operations. This is increasingly relevant as people use subinterpreters more.

https://bugs.python.org/issue35724
This commit is contained in:
Eric Snow 2019-02-23 15:40:43 -07:00 committed by GitHub
parent 06babb2422
commit 64d6cc826d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 9 deletions

View file

@ -379,9 +379,16 @@ handle_signals(void)
{
return 0;
}
/*
* Ensure that the thread isn't currently running some other
* interpreter.
*/
if (_PyInterpreterState_GET_UNSAFE() != _PyRuntime.interpreters.main) {
return 0;
}
UNSIGNAL_PENDING_SIGNALS();
if (PyErr_CheckSignals() < 0) {
if (_PyErr_CheckSignals() < 0) {
SIGNAL_PENDING_SIGNALS(); /* We're not done yet */
return -1;
}