diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-09-25 17:34:12 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-09-25 17:34:12 +0200 |
| commit | 2d6796aac51d8a5963f552b8fa23a2396a987913 (patch) | |
| tree | b67ad0bdad0d0601b454fdf5741422319e43afd7 /lib | |
| parent | bb94b92894eef5d62d9b19b39cf5af921ee5fd2d (diff) | |
curl_multi_fdset: avoid FD_SET out of bounds
If a socket is larger than FD_SETSIZE, avoid using FD_SET() on the
platforms where this is possible.
Bug: http://curl.haxx.se/bug/view.cgi?id=3413274
Reported by: Tim Starling
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/multi.c | 5 | ||||
| -rw-r--r-- | lib/select.c | 14 | ||||
| -rw-r--r-- | lib/select.h | 16 |
3 files changed, 19 insertions, 16 deletions
diff --git a/lib/multi.c b/lib/multi.c index 5a1cef40d..13f5619cc 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -42,6 +42,7 @@ #include "timeval.h" #include "http.h" #include "warnless.h" +#include "select.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -907,11 +908,11 @@ CURLMcode curl_multi_fdset(CURLM *multi_handle, for(i=0; i< MAX_SOCKSPEREASYHANDLE; i++) { curl_socket_t s = CURL_SOCKET_BAD; - if(bitmap & GETSOCK_READSOCK(i)) { + if((bitmap & GETSOCK_READSOCK(i)) && VALID_SOCK((sockbunch[i]))) { FD_SET(sockbunch[i], read_fd_set); s = sockbunch[i]; } - if(bitmap & GETSOCK_WRITESOCK(i)) { + if((bitmap & GETSOCK_WRITESOCK(i)) && VALID_SOCK((sockbunch[i]))) { FD_SET(sockbunch[i], write_fd_set); s = sockbunch[i]; } diff --git a/lib/select.c b/lib/select.c index 79475d539..6cecbf701 100644 --- a/lib/select.c +++ b/lib/select.c @@ -46,20 +46,6 @@ #include "select.h" #include "warnless.h" -/* Winsock and TPF sockets are not in range [0..FD_SETSIZE-1] */ - -#if defined(USE_WINSOCK) || defined(TPF) -#define VERIFY_SOCK(x) Curl_nop_stmt -#else -#define VALID_SOCK(s) (((s) >= 0) && ((s) < FD_SETSIZE)) -#define VERIFY_SOCK(x) do { \ - if(!VALID_SOCK(x)) { \ - SET_SOCKERRNO(EINVAL); \ - return -1; \ - } \ -} WHILE_FALSE -#endif - /* Convenience local macros */ #define elapsed_ms (int)curlx_tvdiff(curlx_tvnow(), initial_tv) diff --git a/lib/select.h b/lib/select.h index d785fb393..56729a3b2 100644 --- a/lib/select.h +++ b/lib/select.h @@ -96,4 +96,20 @@ int tpf_select_libcurl(int maxfds, fd_set* reads, fd_set* writes, fd_set* excepts, struct timeval* tv); #endif +/* Winsock and TPF sockets are not in range [0..FD_SETSIZE-1], which + unfortunately makes it impossible for us to easily check if they're valid +*/ +#if defined(USE_WINSOCK) || defined(TPF) +#define VALID_SOCK(x) 1 +#define VERIFY_SOCK(x) Curl_nop_stmt +#else +#define VALID_SOCK(s) (((s) >= 0) && ((s) < FD_SETSIZE)) +#define VERIFY_SOCK(x) do { \ + if(!VALID_SOCK(x)) { \ + SET_SOCKERRNO(EINVAL); \ + return -1; \ + } \ +} WHILE_FALSE +#endif + #endif /* __SELECT_H */ |