diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-18 13:28:06 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-18 13:28:06 +0000 |
commit | 440fec216c712076701ef81c126c96e09c5a1325 (patch) | |
tree | b9dbb1bb98384be27effc5c006d8335fb8089145 | |
parent | 9d8bb15c5c9f090b28322cde172b1321ea893e22 (diff) |
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_7@22418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | win32/win32.c | 4 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Wed Feb 18 22:28:00 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_isatty): check whether fd is valid. + Wed Feb 18 22:24:23 2009 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (waitpid): fix bug of checking child slot. @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-18" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090218 -#define RUBY_PATCHLEVEL 126 +#define RUBY_PATCHLEVEL 127 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/win32.c b/win32/win32.c index abe3949600..944ff3a931 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4088,6 +4088,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; |