merge revision(s) 20540:

	* win32/win32.c (rb_w32_isatty): check whether fd is valid.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index eac1565bd5..91be64de8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 18 22:27:11 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_isatty): check whether fd is valid.
+
 Wed Feb 18 22:23:44 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (waitpid): fix bug of checking child slot.
diff --git a/version.h b/version.h
index 699bfc9524..2a3d4584a1 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-18"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090218
-#define RUBY_PATCHLEVEL 340
+#define RUBY_PATCHLEVEL 341
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
diff --git a/win32/win32.c b/win32/win32.c
index 5fd4678383..91b4ea89b8 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3911,6 +3911,10 @@ rb_w32_unlink(const char *path)
 int
 rb_w32_isatty(int fd)
 {
+    // validate fd by using _get_osfhandle() because we cannot access _nhandle
+    if (_get_osfhandle(fd) == -1) {
+	return 0;
+    }
     if (!(_osfile(fd) & FOPEN)) {
 	errno = EBADF;
 	return 0;