From 623b439abebc913bc416d92f38fe371e84b0276b Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Fri, 1 Jun 2018 03:50:24 -0700 Subject: [PATCH] bpo-30654: Do not reset SIGINT handler to SIG_DFL in finisignal (GH-7146) (GH-7306) (cherry picked from commit e905c84494526363086f66a979e317e155bf9536) Co-authored-by: pkerling --- .../2018-05-28-12-28-53.bpo-30654.9fDJye.rst | 2 ++ Modules/signalmodule.c | 14 ++------------ 2 files changed, 4 insertions(+), 12 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2018-05-28-12-28-53.bpo-30654.9fDJye.rst 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 00000000000..01c27daa8f8 --- /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 aa224fd78c9..e70c6fc3969 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -118,13 +118,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 @@ -1291,7 +1284,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 @@ -1497,14 +1490,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);