From 5d65e0982d294e312602e3aef1f4b79c0f0cc0c1 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@20539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'win32') diff --git a/win32/win32.c b/win32/win32.c index 80c9f748ba..872fcd013c 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 v1.2.3