From f6f90ff079a22b79a58d47b6117cc8a8c7d366f3 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 3 Nov 2017 19:58:46 +0100 Subject: bpo-30057: Fix potential missed signal in signal.signal(). (#4258) Bug report and patch by Jeroen Demeyer. --- Misc/ACKS | 1 + Misc/NEWS.d/next/Library/2017-11-03-19-11-43.bpo-30057.NCaijI.rst | 1 + Modules/signalmodule.c | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2017-11-03-19-11-43.bpo-30057.NCaijI.rst diff --git a/Misc/ACKS b/Misc/ACKS index 1bd3c04..0511390 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -362,6 +362,7 @@ Vincent Delft Arnaud Delobelle Konrad Delong Erik Demaine +Jeroen Demeyer Martin Dengler John Dennis L. Peter Deutsch diff --git a/Misc/NEWS.d/next/Library/2017-11-03-19-11-43.bpo-30057.NCaijI.rst b/Misc/NEWS.d/next/Library/2017-11-03-19-11-43.bpo-30057.NCaijI.rst new file mode 100644 index 0000000..5740eb2 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-11-03-19-11-43.bpo-30057.NCaijI.rst @@ -0,0 +1 @@ +Fix potential missed signal in signal.signal(). diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index d470727..1023244 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -461,12 +461,15 @@ signal_signal_impl(PyObject *module, int signalnum, PyObject *handler) } else func = signal_handler; + /* Check for pending signals before changing signal handler */ + if (PyErr_CheckSignals()) { + return NULL; + } if (PyOS_setsig(signalnum, func) == SIG_ERR) { PyErr_SetFromErrno(PyExc_OSError); return NULL; } old_handler = Handlers[signalnum].func; - _Py_atomic_store_relaxed(&Handlers[signalnum].tripped, 0); Py_INCREF(handler); Handlers[signalnum].func = handler; if (old_handler != NULL) -- cgit v0.12