diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2005-04-25 23:51:33 +0000 |
|---|---|---|
| committer | Mark Mitchell <mark@codesourcery.com> | 2005-04-25 23:51:33 +0000 |
| commit | 2699e2c9673de9d67e16a35fa61469e0de89675d (patch) | |
| tree | 36b8bbe2540f94789db590ce2f3c69134b9cb030 /gdb/event-loop.c | |
| parent | a2ace17205465822f95a1152198e31431d2e60a8 (diff) | |
| download | gdb-2699e2c9673de9d67e16a35fa61469e0de89675d.tar.gz | |
* event-loop.c (gdb_select): Program defensively.
Diffstat (limited to 'gdb/event-loop.c')
| -rw-r--r-- | gdb/event-loop.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gdb/event-loop.c b/gdb/event-loop.c index 1db32a826ec..2f3d5359b79 100644 --- a/gdb/event-loop.c +++ b/gdb/event-loop.c @@ -760,7 +760,10 @@ gdb_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, if something starts using it. */ gdb_assert (!FD_ISSET (fd, writefds)); if (FD_ISSET (fd, readfds)) - handles[num_handles++] = (HANDLE) _get_osfhandle (fd); + { + gdb_assert (num_handles < MAXIMUM_WAIT_OBJECTS); + handles[num_handles++] = (HANDLE) _get_osfhandle (fd); + } } event = WaitForMultipleObjects (num_handles, handles, @@ -779,15 +782,17 @@ gdb_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, return 0; /* Run through the READFDS, clearing bits corresponding to descriptors for which input is unavailable. */ - num_ready = num_handlers; + num_ready = num_handles; h = handles[event - WAIT_OBJECT_0]; for (fd = 0; fd < n; ++fd) { - HANDLE fd_h = (HANDLE) _get_osfhandle (fd); + HANDLE fd_h; + if (!FD_ISSET (fd, readfds)) + continue; + fd_h = (HANDLE) _get_osfhandle (fd); /* This handle might be ready, even though it wasn't the handle returned by WaitForMultipleObjects. */ - if (FD_ISSET (fd, readfds) && fd_h != h - && WaitForSingleObject (fd_h, 0) != WAIT_OBJECT_0) + if (fd_h != h && WaitForSingleObject (fd_h, 0) != WAIT_OBJECT_0) { FD_CLR (fd, readfds); --num_ready; |