diff options
| author | Charles-François Natali <neologix@free.fr> | 2011-08-28 14:22:33 (GMT) |
|---|---|---|
| committer | Charles-François Natali <neologix@free.fr> | 2011-08-28 14:22:33 (GMT) |
| commit | fda7b379acde3ad60bbd42acb6da7e7099d25133 (patch) | |
| tree | 8a6f41e799670ac5cea353e6cc4bc671fec25798 /Modules/selectmodule.c | |
| parent | bbabbae114f6d16dacdc1ad8f6f04b95fb6b17eb (diff) | |
| download | cpython-fda7b379acde3ad60bbd42acb6da7e7099d25133.zip cpython-fda7b379acde3ad60bbd42acb6da7e7099d25133.tar.gz cpython-fda7b379acde3ad60bbd42acb6da7e7099d25133.tar.bz2 | |
Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is
greater than FD_SETSIZE.
Diffstat (limited to 'Modules/selectmodule.c')
| -rw-r--r-- | Modules/selectmodule.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index ac604b6..5a8580c 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -114,7 +114,7 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1]) #if defined(_MSC_VER) max = 0; /* not used for Win32 */ #else /* !_MSC_VER */ - if (v < 0 || v >= FD_SETSIZE) { + if (!_PyIsSelectable_fd(v)) { PyErr_SetString(PyExc_ValueError, "filedescriptor out of range in select()"); goto finally; @@ -164,13 +164,6 @@ set2list(fd_set *set, pylist fd2obj[FD_SETSIZE + 1]) for (j = 0; fd2obj[j].sentinel >= 0; j++) { fd = fd2obj[j].fd; if (FD_ISSET(fd, set)) { -#ifndef _MSC_VER - if (fd > FD_SETSIZE) { - PyErr_SetString(PyExc_SystemError, - "filedescriptor out of range returned in select()"); - goto finally; - } -#endif o = fd2obj[j].obj; fd2obj[j].obj = NULL; /* transfer ownership */ |