Mercurial > cpython-lru_cache-weakref
diff Modules/socketmodule.c @ 72113:ff6adb867f40 2.7
Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is
greater than FD_SETSIZE.
| author | Charles-François Natali <neologix@free.fr> |
|---|---|
| date | Sun, 28 Aug 2011 16:22:33 +0200 |
| parents | dfe6f0a603d2 |
| children | 0c10061df711 |
line wrap: on
line diff
--- a/Modules/socketmodule.c Sun Aug 28 11:23:57 2011 +0200 +++ b/Modules/socketmodule.c Sun Aug 28 16:22:33 2011 +0200 @@ -456,18 +456,14 @@ #include <sys/poll.h> #endif -#ifdef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE -/* Platform can select file descriptors beyond FD_SETSIZE */ -#define IS_SELECTABLE(s) 1 -#elif defined(HAVE_POLL) +#ifdef HAVE_POLL /* Instead of select(), we'll use poll() since poll() works on any fd. */ #define IS_SELECTABLE(s) 1 /* Can we call select() with this socket without a buffer overrun? */ #else -/* POSIX says selecting file descriptors beyond FD_SETSIZE - has undefined behaviour. If there's no timeout left, we don't have to - call select, so it's a safe, little white lie. */ -#define IS_SELECTABLE(s) ((s)->sock_fd < FD_SETSIZE || s->sock_timeout <= 0.0) +/* If there's no timeout left, we don't have to call select, so it's a safe, + * little white lie. */ +#define IS_SELECTABLE(s) (_PyIsSelectable_fd((s)->sock_fd) || (s)->sock_timeout <= 0.0) #endif static PyObject*