* mingw-hdep.c (gdb_select): Always check for NULL fd sets

	before calling FD_ISSET.  Correct check for exceptfds which
	previously tested writefds.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2389cb2fb2805c19b0e2decb3d173d1214c492ab..83a02a58a2453a81b61ca173482ebf2649f1c1f6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -6,6 +6,12 @@
        insert_step_resume_breakpoint_at_caller.
        (insert_step_resume_breakpoint_at_frame): Revise comments.
 
+2006-06-10  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * mingw-hdep.c (gdb_select): Always check for NULL fd sets
+       before calling FD_ISSET.  Correct check for exceptfds which
+       previously tested writefds.
+
 2006-06-02  Joel Brobecker  <brobecker@adacore.com>
 
        * version.in: Increase version number to 6.4.91 after the first

diff --git a/gdb/mingw-hdep.c b/gdb/mingw-hdep.c
index bb0f50aaa46f59e17d0a59d017d11bf41df44098..2b92a1ce2f8e606d35162e0a931e246788fc6d19 100644 (file)
--- a/gdb/mingw-hdep.c
+++ b/gdb/mingw-hdep.c
@@ -105,8 +105,8 @@ gdb_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
         if something starts using it.  */
       gdb_assert (!writefds || !FD_ISSET (fd, writefds));
 
-      if (!FD_ISSET (fd, readfds)
-         && !FD_ISSET (fd, exceptfds))
+      if ((!readfds || !FD_ISSET (fd, readfds))
+         && (!exceptfds || !FD_ISSET (fd, exceptfds)))
        continue;
       h = (HANDLE) _get_osfhandle (fd);
 
@@ -124,13 +124,13 @@ gdb_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
          except = never_handle;
        }
 
-      if (FD_ISSET (fd, readfds))
+      if (readfds && FD_ISSET (fd, readfds))
        {
          gdb_assert (num_handles < MAXIMUM_WAIT_OBJECTS);
          handles[num_handles++] = read;
        }
 
-      if (FD_ISSET (fd, exceptfds))
+      if (exceptfds && FD_ISSET (fd, exceptfds))
        {
          gdb_assert (num_handles < MAXIMUM_WAIT_OBJECTS);
          handles[num_handles++] = except;
@@ -169,10 +169,11 @@ gdb_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
       HANDLE fd_h;
       struct serial *scb;
 
-      if (!FD_ISSET (fd, readfds) && !FD_ISSET (fd, writefds))
+      if ((!readfds || !FD_ISSET (fd, readfds))
+         && (!exceptfds || !FD_ISSET (fd, exceptfds)))
        continue;
 
-      if (FD_ISSET (fd, readfds))
+      if (readfds && FD_ISSET (fd, readfds))
        {
          fd_h = handles[indx++];
          /* This handle might be ready, even though it wasn't the handle
@@ -183,7 +184,7 @@ gdb_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
            num_ready++;
        }
 
-      if (FD_ISSET (fd, exceptfds))
+      if (exceptfds && FD_ISSET (fd, exceptfds))
        {
          fd_h = handles[indx++];
          /* This handle might be ready, even though it wasn't the handle