From f3fcd2e4a0b7680fa1ba813b8f7eb257cce41ec7 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 11 Jul 2008 11:51:39 +0000
Subject: * io.c (rb_io_wait_readable, rb_io_wait_writable): check if the file 
  descriptor is closed.

* thread.c (rb_thread_wait_fd_rw): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 io.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'io.c')

diff --git a/io.c b/io.c
index cac73d784b..f7898b61d4 100644
--- a/io.c
+++ b/io.c
@@ -608,6 +608,9 @@ rb_io_wait_readable(int f)
 {
     rb_fdset_t rfds;
 
+    if (f < 0) {
+	rb_raise(rb_eIOError, "closed stream");
+    }
     switch (errno) {
       case EINTR:
 #if defined(ERESTART)
@@ -650,6 +653,9 @@ rb_io_wait_writable(int f)
 {
     rb_fdset_t wfds;
 
+    if (f < 0) {
+	rb_raise(rb_eIOError, "closed stream");
+    }
     switch (errno) {
       case EINTR:
 #if defined(ERESTART)
@@ -1484,11 +1490,8 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
 	if (RSTRING_LEN(str) != len) goto modified;
         if (nonblock) {
             rb_io_set_nonblock(fptr);
-	    n = rb_read_internal(fptr->fd, RSTRING_PTR(str), len);
         }
-        else {
-            n = rb_read_internal(fptr->fd, RSTRING_PTR(str), len);
-	}
+	n = rb_read_internal(fptr->fd, RSTRING_PTR(str), len);
         if (n < 0) {
             if (!nonblock && rb_io_wait_readable(fptr->fd))
                 goto again;
-- 
cgit v1.2.3