diff options
| author | pkerling <pkerling@casix.org> | 2018-06-01 09:47:18 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <pitrou@free.fr> | 2018-06-01 09:47:18 (GMT) |
| commit | e905c84494526363086f66a979e317e155bf9536 (patch) | |
| tree | 93699c2a9893978226ffa0ccf63a2954a043b40a | |
| parent | 23cee80cfade1a9019c52b3a17d8e5c1b5db17e2 (diff) | |
| download | cpython-e905c84494526363086f66a979e317e155bf9536.zip cpython-e905c84494526363086f66a979e317e155bf9536.tar.gz cpython-e905c84494526363086f66a979e317e155bf9536.tar.bz2 | |
bpo-30654: Do not reset SIGINT handler to SIG_DFL in finisignal (GH-7146)
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2018-05-28-12-28-53.bpo-30654.9fDJye.rst | 2 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-05-28-12-28-53.bpo-30654.9fDJye.rst b/Misc/NEWS.d/next/Core and Builtins/2018-05-28-12-28-53.bpo-30654.9fDJye.rst new file mode 100644 index 0000000..01c27daa --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-05-28-12-28-53.bpo-30654.9fDJye.rst @@ -0,0 +1,2 @@ +Fixed reset of the SIGINT handler to SIG_DFL on interpreter shutdown even +when there was a custom handler set previously. Patch by Philipp Kerling. diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 818df7d..9de5c2e 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -126,13 +126,6 @@ static PyObject *DefaultHandler; static PyObject *IgnoreHandler; static PyObject *IntHandler; -/* On Solaris 8, gcc will produce a warning that the function - declaration is not a prototype. This is caused by the definition of - SIG_DFL as (void (*)())0; the correct declaration would have been - (void (*)(int))0. */ - -static PyOS_sighandler_t old_siginthandler = SIG_DFL; - #ifdef MS_WINDOWS static HANDLE sigint_event = NULL; #endif @@ -1336,7 +1329,7 @@ PyInit__signal(void) /* Install default int handler */ Py_INCREF(IntHandler); Py_SETREF(Handlers[SIGINT].func, IntHandler); - old_siginthandler = PyOS_setsig(SIGINT, signal_handler); + PyOS_setsig(SIGINT, signal_handler); } #ifdef SIGHUP @@ -1542,14 +1535,11 @@ finisignal(void) int i; PyObject *func; - PyOS_setsig(SIGINT, old_siginthandler); - old_siginthandler = SIG_DFL; - for (i = 1; i < NSIG; i++) { func = Handlers[i].func; _Py_atomic_store_relaxed(&Handlers[i].tripped, 0); Handlers[i].func = NULL; - if (i != SIGINT && func != NULL && func != Py_None && + if (func != NULL && func != Py_None && func != DefaultHandler && func != IgnoreHandler) PyOS_setsig(i, SIG_DFL); Py_XDECREF(func); |