[Python-checkins] bpo-30654: Do not reset SIGINT handler to SIG_DFL in finisignal (GH-7146) (GH-7307)
Antoine Pitrou
webhook-mailer at python.org
Fri Jun 1 07:12:18 EDT 2018
https://github.com/python/cpython/commit/1d5198fd41ad9185e9e6b3aa595769c3693d57be
commit: 1d5198fd41ad9185e9e6b3aa595769c3693d57be
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Antoine Pitrou <pitrou at free.fr>
date: 2018-06-01T13:12:11+02:00
summary:
bpo-30654: Do not reset SIGINT handler to SIG_DFL in finisignal (GH-7146) (GH-7307)
(cherry picked from commit e905c84494526363086f66a979e317e155bf9536)
Co-authored-by: pkerling <pkerling at casix.org>
files:
A Misc/NEWS.d/next/Core and Builtins/2018-05-28-12-28-53.bpo-30654.9fDJye.rst
M Modules/signalmodule.c
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 000000000000..01c27daa8f88
--- /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 14665cbfd5cb..a93dc64cc828 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -119,13 +119,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
@@ -1288,7 +1281,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
@@ -1494,14 +1487,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);
More information about the Python-checkins
mailing list