From 434b0738dda0e9e89f7f2ab2a4eae156a56ddba6 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 18 Sep 2000 19:01:21 +0000 Subject: [PATCH] Don't check fd_sets until after we check fd < dtblsize --- servers/slapd/daemon.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index 997a1ea1bb..bca5aed17b 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -870,11 +870,21 @@ slapd_daemon_task( continue; } +#ifndef HAVE_WINSOCK + /* make sure descriptor number isn't too great */ + if ( s >= dtblsize ) { + Debug( LDAP_DEBUG_ANY, + "daemon: %ld beyond descriptor table size %ld\n", + (long) s, (long) dtblsize, 0 ); + slapd_close(s); + continue; + } +#endif + #ifdef LDAP_DEBUG ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex ); /* newly accepted stream should not be in any of the FD SETS */ - assert( !FD_ISSET( s, &slap_daemon.sd_actives) ); assert( !FD_ISSET( s, &slap_daemon.sd_readers) ); assert( !FD_ISSET( s, &slap_daemon.sd_writers) ); @@ -882,17 +892,6 @@ slapd_daemon_task( ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex ); #endif -#ifndef HAVE_WINSOCK - /* make sure descriptor number isn't too great */ - if ( s >= dtblsize ) { - Debug( LDAP_DEBUG_ANY, - "daemon: %ld beyond descriptor table size %ld\n", - (long) s, (long) dtblsize, 0 ); - slapd_close(s); - continue; - } -#endif - Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n", (long) s, 0, 0 ); -- 2.39.5