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

1 files changed, 4 insertions, 0 deletions

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;