generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid an overflow if an excessive amount of servers are used

Browse Source
This commit is contained in:
Daniel Stenberg 2006-10-12 16:47:50 +00:00
parent 95c3fa836b
commit 47ea80baee
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ares/ares_getsock.c
View File

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
/* Copyright 2005 by Daniel Stenberg. /* Copyright (C) 2005 - 2006, Daniel Stenberg
* *
* Permission to use, copy, modify, and distribute this software and its * Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose and without fee is hereby granted, provided * documentation for any purpose and without fee is hereby granted, provided
@ -39,7 +39,9 @@ int ares_getsock(ares_channel channel,
if (!channel->queries) if (!channel->queries)
return 0; return 0;
for (i = 0; i < channel->nservers; i++) for (i = 0;
(i < channel->nservers) && (sockindex < ARES_GETSOCK_MAXNUM);
i++)
{ {
server = &channel->servers[i]; server = &channel->servers[i];
if (server->udp_socket != ARES_SOCKET_BAD) if (server->udp_socket != ARES_SOCKET_BAD)
@ -56,13 +58,12 @@ int ares_getsock(ares_channel channel,
break; break;
socks[sockindex] = server->tcp_socket; socks[sockindex] = server->tcp_socket;
bitmap |= ARES_GETSOCK_READABLE(setbits, sockindex); bitmap |= ARES_GETSOCK_READABLE(setbits, sockindex);
sockindex++;
if (server->qhead) { if (server->qhead)
/* then the tcp socket is also writable! */ /* then the tcp socket is also writable! */
bitmap |= ARES_GETSOCK_WRITABLE(setbits, sockindex-1); bitmap |= ARES_GETSOCK_WRITABLE(setbits, sockindex);
}
sockindex++;
} }
} }
return bitmap; return bitmap;