X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2Fposix%2FSelect.c;h=0127b3cef4259c70a8555ba1a8a56607fc63cf88;hp=d36e122079e366adf30df0e141170e4f0a424327;hb=8901e61c4705b8888676250e89731f40ca198751;hpb=aeeeda3efad5266b0c52b92807bb0cc3b3f23b5c

diff --git a/rts/posix/Select.c b/rts/posix/Select.c
index d36e122..0127b3c 100644
--- a/rts/posix/Select.c
+++ b/rts/posix/Select.c
@@ -81,6 +81,13 @@ wakeUpSleepingThreads(lnat ticks)
     return flag;
 }
 
+static void GNUC3_ATTRIBUTE(__noreturn__)
+fdOutOfRange (int fd)
+{
+    errorBelch("file descriptor %d out of range for select (0--%d).\nRecompile with -threaded to work around this.", fd, (int)FD_SETSIZE);
+    stg_exit(EXIT_FAILURE);
+}
+
 /* Argument 'wait' says whether to wait for I/O to become available,
  * or whether to just check and return immediately.  If there are
  * other threads ready to run, we normally do the non-waiting variety,
@@ -156,8 +163,8 @@ awaitEvent(rtsBool wait)
 	case BlockedOnRead:
 	  { 
 	    int fd = tso->block_info.fd;
-	    if (fd >= (int)FD_SETSIZE) {
-		barf("awaitEvent: descriptor out of range");
+	    if ((fd >= (int)FD_SETSIZE) || (fd < 0)) {
+                fdOutOfRange(fd);
 	    }
 	    maxfd = (fd > maxfd) ? fd : maxfd;
 	    FD_SET(fd, &rfd);
@@ -167,8 +174,8 @@ awaitEvent(rtsBool wait)
 	case BlockedOnWrite:
 	  { 
 	    int fd = tso->block_info.fd;
-	    if (fd >= (int)FD_SETSIZE) {
-		barf("awaitEvent: descriptor out of range");
+	    if ((fd >= (int)FD_SETSIZE) || (fd < 0)) {
+                fdOutOfRange(fd);
 	    }
 	    maxfd = (fd > maxfd) ? fd : maxfd;
 	    FD_SET(fd, &wfd);
@@ -294,3 +301,4 @@ awaitEvent(rtsBool wait)
 }
 
 #endif /* THREADED_RTS */
+