diff options
| -rw-r--r-- | io.c | 3 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 30 |
2 files changed, 32 insertions, 1 deletions
@@ -424,7 +424,7 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd) if (!READ_DATA_PENDING(fptr)) {\ WAIT_FD_IN_WIN32(fptr);\ rb_io_check_closed(fptr);\ - }\ + }\ } while(0) #ifndef S_ISSOCK @@ -1775,6 +1775,7 @@ io_fillbuf(rb_io_t *fptr) rb_syserr_fail_path(e, path); } } + if (r > 0) READ_CHECK(fptr); fptr->rbuf.off = 0; fptr->rbuf.len = (int)r; /* r should be <= rbuf_capa */ if (r == 0) diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index f2a287a543..687c27c63d 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -3366,6 +3366,36 @@ __END__ end end if File::BINARY != 0 + def test_race_gets_and_close + assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}") + bug13076 = '[ruby-core:78845] [Bug #13076]' + begin; + 100.times do |i| + a = [] + t = [] + 10.times do + r,w = IO.pipe + a << [r,w] + t << Thread.new do + begin + while r.gets + end + rescue IOError + end + end + end + a.each do |r,w| + w.puts "hoge" + w.close + r.close + end + assert_nothing_raised(IOError, bug13076) { + t.each(&:join) + } + end + end; + end + if RUBY_ENGINE == "ruby" # implementation details def test_foreach_rs_conversion make_tempfile {|t| |