diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-10-18 20:54:37 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-10-18 20:54:37 +0200 |
| commit | 1a9327d5cd660040a282ab595509c16fe90f63a2 (patch) | |
| tree | e61e620c38b55d57106d359f446e410643753177 /src | |
| parent | afb8aa2482db730a8ebdabe314c320c01dda383c (diff) | |
| download | emacs-1a9327d5cd660040a282ab595509c16fe90f63a2.tar.gz | |
* nsterm.m (ns_select): Check writefds before call to
FD_ISSET.
Fixes: debbugs:12668
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6fece1e72c5..f1e3a99dbc6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-10-18 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (ns_select): Check writefds before call to + FD_ISSET (Bug#12668). + 2012-10-18 Daniel Colascione <dancol@dancol.org> * alloc.c (NSTATICS): Increase from 0x650 to 0x1000 diff --git a/src/nsterm.m b/src/nsterm.m index dfc84db50f7..a4eaad47ac1 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3443,10 +3443,10 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds, /* NSTRACE (ns_select); */ - for (k = 0; readfds && k < nfds+1; k++) + for (k = 0; k < nfds+1; k++) { - if (FD_ISSET(k, readfds)) ++nr; - if (FD_ISSET(k, writefds)) ++nr; + if (readfds && FD_ISSET(k, readfds)) ++nr; + if (writefds && FD_ISSET(k, writefds)) ++nr; } if (NSApp == nil |