diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2013-05-04 21:16:59 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2013-05-04 21:16:59 (GMT) |
| commit | c8c952ce2a77343b6fe87a9534026b4b34011322 (patch) | |
| tree | 2dda637adc73ae67d24a27e39456e9922be2b333 | |
| parent | 957a23b0883c1d92f4d5c5de2459319615a8ed34 (diff) | |
| download | cpython-c8c952ce2a77343b6fe87a9534026b4b34011322.zip cpython-c8c952ce2a77343b6fe87a9534026b4b34011322.tar.gz cpython-c8c952ce2a77343b6fe87a9534026b4b34011322.tar.bz2 | |
Issue #14173: Avoid crashing when reading a signal handler during interpreter shutdown.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 14 |
2 files changed, 14 insertions, 3 deletions
@@ -47,6 +47,9 @@ Core and Builtins Library ------- +- Issue #14173: Avoid crashing when reading a signal handler during + interpreter shutdown. + - Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions. - Issue #15902: Fix imp.load_module() accepting None as a file when loading an diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 0cc7237..fbe1bb7 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -344,7 +344,10 @@ signal_signal(PyObject *self, PyObject *args) Handlers[sig_num].tripped = 0; Py_INCREF(obj); Handlers[sig_num].func = obj; - return old_handler; + if (old_handler != NULL) + return old_handler; + else + Py_RETURN_NONE; } PyDoc_STRVAR(signal_doc, @@ -372,8 +375,13 @@ signal_getsignal(PyObject *self, PyObject *args) return NULL; } old_handler = Handlers[sig_num].func; - Py_INCREF(old_handler); - return old_handler; + if (old_handler != NULL) { + Py_INCREF(old_handler); + return old_handler; + } + else { + Py_RETURN_NONE; + } } PyDoc_STRVAR(getsignal_doc, |