fix for bug #153 crash part.

wcawijngaards · wcawijngaards · commit d115ed6b3995 · 2006-11-16T12:58:49.000Z
git-svn-id: file:///svn/nsd/trunk@2503 a26ef69c-88ff-0310-839f-98b793d9c207
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,6 @@
+16 November 2006: Wouter
+	- Bug #153: now checks for FD_SETSIZE when adding fd to select fdset.
+
 15 November 2006: Wouter
 	- Fixed bug #152: identity keyword in nsd.conf did not work.
 	  What happened was that the hostname() from the computer 
diff --git a/netio.c b/netio.c
@@ -153,7 +153,7 @@ netio_dispatch(netio_type *netio, const struct timespec *timeout, const sigset_t
 
 	for (elt = netio->handlers; elt; elt = elt->next) {
 		netio_handler_type *handler = elt->handler;
-		if (handler->fd >= 0) {
+		if (handler->fd >= 0 && handler->fd < FD_SETSIZE) {
 			if (handler->fd > max_fd) {
 				max_fd = handler->fd;
 			}
diff --git a/tpkg/bug153_socketlimit.tpkg b/tpkg/bug153_socketlimit.tpkg
diff --git a/tpkg/bugzilla-bugs b/tpkg/bugzilla-bugs
@@ -81,3 +81,4 @@ T 141   "NSD does not clear flags on formerr"
 T 144	"Defaults in LOC records not RFC 1876 compliant"
 T 145	"NSD doesn't support multiple AXFR simultaneously" in long dir.
 T 152	"identity keyword in nsd.conf does not function properly"
+T 153	"Crash when using 10000 secondary zones"

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ netio_dispatch(netio_type netio, const struct timespec timeout, const sigset_t`
`153`	`153`
`154`	`154`	`for (elt = netio->handlers; elt; elt = elt->next) {`
`155`	`155`	`netio_handler_type *handler = elt->handler;`
`156`		`- if (handler->fd >= 0) {`
	`156`	`+ if (handler->fd >= 0 && handler->fd < FD_SETSIZE) {`
`157`	`157`	`if (handler->fd > max_fd) {`
`158`	`158`	`max_fd = handler->fd;`
`159`	`159`	`}`