diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b15de937d..10262ab3d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-10  Christopher Faylor  <cgf@redhat.com>
+
+	* select.cc (select_stuff::wait): Correctly check for w4 array bounds.
+
 2004-08-03  Corinna Vinschen  <corinna@vinschen.de>
 
 	* errno.cc (errmap): Add ERROR_TOO_MANY_LINKS -> EMLINK mapping.
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index eba122e66..b24446928 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -233,7 +233,7 @@ select_stuff::wait (fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
      counting the number of active fds. */
   while ((s = s->next))
     {
-      if (m > MAXIMUM_WAIT_OBJECTS)
+      if (m >= MAXIMUM_WAIT_OBJECTS)
 	{
 	  set_sig_errno (EINVAL);
 	  return -1;