3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-28 23:49:44 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #504 from himanshupsharma/check_fd-setsize

Browse Source 
Reverting (socket < 0) checks to avoid Windows build failure.
This commit is contained in:
Marko Mikulicic 2015-04-03 11:22:50 +02:00
commit 8a2aa72571
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mongoose.c
View File

@ -1060,7 +1060,7 @@ static void ns_handle_udp(struct ns_connection *ls) {
} }
static void ns_add_to_set(sock_t sock, fd_set *set, sock_t *max_fd) { static void ns_add_to_set(sock_t sock, fd_set *set, sock_t *max_fd) {
if ( (sock != INVALID_SOCKET) && (sock >= 0) && (sock < FD_SETSIZE) ) { if ( (sock != INVALID_SOCKET) && (sock < FD_SETSIZE) ) {
FD_SET(sock, set); FD_SET(sock, set);
if (*max_fd == INVALID_SOCKET || sock > *max_fd) { if (*max_fd == INVALID_SOCKET || sock > *max_fd) {
*max_fd = sock; *max_fd = sock;
@ -1971,9 +1971,9 @@ struct threadparam {
}; };
static int wait_until_ready(sock_t sock, int for_read) { static int wait_until_ready(sock_t sock, int for_read) {
if ( (sock < 0) || (sock >= FD_SETSIZE) )
return 0;
fd_set set; fd_set set;
if ( (sock == INVALID_SOCKET) || (sock >= FD_SETSIZE) )
return 0;
FD_ZERO(&set); FD_ZERO(&set);
FD_SET(sock, &set); FD_SET(sock, &set);
select(sock + 1, for_read ? &set : 0, for_read ? 0 : &set, 0, 0); select(sock + 1, for_read ? &set : 0, for_read ? 0 : &set, 0, 0);