From: Jan Djärv <jan.h.d@swipnet.se>
Date: Thu, 18 Oct 2012 18:54:37 +0000 (+0200)
Subject: * nsterm.m (ns_select): Check writefds before call to
X-Git-Tag: emacs-24.2.90~220
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a9327d5cd660040a282ab595509c16fe90f63a2;p=emacs.git

* nsterm.m (ns_select): Check writefds before call to
FD_ISSET.

Fixes: debbugs:12668
---

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