d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assert that descriptor numbers are sane.

Browse Source 
MFC after:	3 days
This commit is contained in:
Pawel Jakub Dawidek 2010-09-22 19:05:54 +00:00
parent 8b70e6ae9c
commit 196abd3518
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=213008
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/hastd/hastd.c
View File

@ -650,18 +650,22 @@ main_loop(void)
/* Setup descriptors for select(2). */
FD_ZERO(&rfds);
maxfd = fd = proto_descriptor(cfg->hc_controlconn);
assert(fd >= 0);
FD_SET(fd, &rfds);
fd = proto_descriptor(cfg->hc_listenconn);
assert(fd >= 0);
FD_SET(fd, &rfds);
maxfd = fd > maxfd ? fd : maxfd;
TAILQ_FOREACH(res, &cfg->hc_resources, hr_next) {
if (res->hr_event == NULL)
continue;
fd = proto_descriptor(res->hr_event);
assert(fd >= 0);
FD_SET(fd, &rfds);
maxfd = fd > maxfd ? fd : maxfd;
}
assert(maxfd + 1 <= (int)FD_SETSIZE);
ret = select(maxfd + 1, &rfds, NULL, NULL, &timeout);
if (ret == 0)
hook_check(false);