OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
before calling FD_ISSET.  Correct check for exceptfds which
	previously tested writefds.
This commit is contained in:
Daniel Jacobowitz 2006-06-10 18:24:32 +00:00
parent b3882df925
commit 98739726e2
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
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-09 Daniel Jacobowitz <dan@codesourcery.com>
Julian Brown <julian@codesourcery.com>

15
gdb/mingw-hdep.c
View File

@ -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