mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 83763 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83763 | brian.curtin | 2010-08-06 14:27:32 -0500 (Fri, 06 Aug 2010) | 3 lines

  Fix #9324: Add parameter validation to signal.signal on Windows in order
  to prevent crashes.
........
This commit is contained in:
Brian Curtin 2010-08-06 19:34:52 +00:00
parent 40b3744efa
commit 3f004b1cc0
4 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Modules/signalmodule.c
View file

@ -249,8 +249,23 @@ signal_signal(PyObject *self, PyObject *args)
int sig_num;
PyObject *old_handler;
void (*func)(int);
#ifdef MS_WINDOWS
int cur_sig, num_valid_sigs = 6;
static int valid_sigs[] = {SIGABRT, SIGFPE, SIGILL, SIGINT,
SIGSEGV, SIGTERM};
BOOL valid_sig = FALSE;
#endif
if (!PyArg_ParseTuple(args, "iO:signal", &sig_num, &obj))
return NULL;
#ifdef MS_WINDOWS
/* Validate that sig_num is one of the allowable signals */
for (cur_sig = 0; cur_sig < num_valid_sigs; cur_sig++)
valid_sig |= (sig_num == valid_sigs[cur_sig]);
if (!valid_sig) {
PyErr_SetString(PyExc_ValueError, "signal number out of range");
return NULL;
}
#endif
#ifdef WITH_THREAD
if (PyThread_get_thread_ident() != main_thread) {
PyErr_SetString(PyExc_ValueError,