From 782f0b0f0f4375bf1ab93ba10daa2e30f5c4992a Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 5 Dec 2008 09:08:24 +0000 Subject: * win32/win32.c (rb_w32_read, rb_w32_write, rb_w32_isatty): check whether fd is valid. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/win32.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index a62703341..79f597142 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Dec 5 18:07:32 2008 NAKAMURA Usaku + + * win32/win32.c (rb_w32_read, rb_w32_write, rb_w32_isatty): check + whether fd is valid. + Fri Dec 5 13:05:45 2008 Nobuyoshi Nakada * iseq.c (rb_iseq_parameters): proc arguments are always optional. diff --git a/win32/win32.c b/win32/win32.c index 80c9f748b..872fcd013 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4316,6 +4316,10 @@ rb_w32_read(int fd, void *buf, size_t size) if (is_socket(sock)) return rb_w32_recv(fd, buf, size, 0); + // validate fd by using _get_osfhandle() because we cannot access _nhandle + if (_get_osfhandle(fd) == -1) { + return -1; + } if (!(_osfile(fd) & FOPEN)) { errno = EBADF; return -1; @@ -4434,6 +4438,10 @@ rb_w32_write(int fd, const void *buf, size_t size) if (is_socket(sock)) return rb_w32_send(fd, buf, size, 0); + // validate fd by using _get_osfhandle() because we cannot access _nhandle + if (_get_osfhandle(fd) == -1) { + return -1; + } if (!(_osfile(fd) & FOPEN)) { errno = EBADF; return -1; @@ -4686,6 +4694,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; -- cgit