1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (rb_update_max_fd): fstat(2) can fail with other than

Browse Source 
EBADF.  [ruby-dev:44837] [Backport #4339].  Cf.
  http://pubs.opengroup.org/onlinepubs/9699919799/functions/fstat.html

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-11-09 14:20:27 +00:00
parent 42b4255d08
commit 1393e55d09
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,4 +1,8 @@
Wed Nov 9 22:54:30 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Nov 9 23:20:22 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_update_max_fd): fstat(2) can fail with other than
EBADF. [ruby-dev:44837] [Backport #4339]. Cf.
http://pubs.opengroup.org/onlinepubs/9699919799/functions/fstat.html
* io.c (rb_sysopen): max fd is updated in rb_sysopen_internal() * io.c (rb_sysopen): max fd is updated in rb_sysopen_internal()
already. already.

2
io.c
View File

@ -151,7 +151,7 @@ void
rb_update_max_fd(int fd) rb_update_max_fd(int fd)
{ {
struct stat buf; struct stat buf;
if (fstat(fd, &buf) != 0) { if (fstat(fd, &buf) != 0 && errno == EBADF) {
rb_bug("rb_update_max_fd: invalid fd (%d) given.", fd); rb_bug("rb_update_max_fd: invalid fd (%d) given.", fd);
} }
if (max_file_descriptor < fd) max_file_descriptor = fd; if (max_file_descriptor < fd) max_file_descriptor = fd;