mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-11 19:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge

Browse source
This commit is contained in:
Brett Cannon 2013-05-04 17:29:36 -04:00
commit 4f9b4343ed
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -69,6 +69,9 @@ Core and Builtins
Library Library
------- -------
- Issue #14173: Avoid crashing when reading a signal handler during
interpreter shutdown.
- Issue #15902: Fix imp.load_module() accepting None as a file when loading an - Issue #15902: Fix imp.load_module() accepting None as a file when loading an
extension module. extension module.

14
Modules/signalmodule.c
View file

@ -339,7 +339,10 @@ signal_signal(PyObject *self, PyObject *args)
Handlers[sig_num].tripped = 0; Handlers[sig_num].tripped = 0;
Py_INCREF(obj); Py_INCREF(obj);
Handlers[sig_num].func = obj; Handlers[sig_num].func = obj;
return old_handler; if (old_handler != NULL)
return old_handler;
else
Py_RETURN_NONE;
} }
PyDoc_STRVAR(signal_doc, PyDoc_STRVAR(signal_doc,
@ -367,8 +370,13 @@ signal_getsignal(PyObject *self, PyObject *args)
return NULL; return NULL;
} }
old_handler = Handlers[sig_num].func; old_handler = Handlers[sig_num].func;
Py_INCREF(old_handler); if (old_handler != NULL) {
return old_handler; Py_INCREF(old_handler);
return old_handler;
}
else {
Py_RETURN_NONE;
}
} }
PyDoc_STRVAR(getsignal_doc, PyDoc_STRVAR(getsignal_doc,