diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-08-06 19:41:01 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-08-06 19:41:01 (GMT) |
| commit | 24af0e965694b997e90c46bd754a394e1ac86b45 (patch) | |
| tree | aabd01076d3553a1420d73ed9bdcf4078f4be07a /Modules | |
| parent | 90374f510223f559a70dcd762e223762d4f2ad85 (diff) | |
| download | cpython-24af0e965694b997e90c46bd754a394e1ac86b45.zip cpython-24af0e965694b997e90c46bd754a394e1ac86b45.tar.gz cpython-24af0e965694b997e90c46bd754a394e1ac86b45.tar.bz2 | |
Merged revisions 83763 via svnmerge from
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.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/signalmodule.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 9dc781d..8675978 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -255,8 +255,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, |