diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | io.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 13 |
3 files changed, 18 insertions, 2 deletions
@@ -1,4 +1,7 @@ -Wed Oct 2 14:18:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Oct 2 14:19:57 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (rb_io_close_write): detach tied IO for writing before closing + to get rid of race condition. [ruby-list:49598] * io.c (rb_io_close_read): keep fptr in write_io to be discarded, to fix freed pointer access when it is in use by other threads, and get @@ -4492,12 +4492,12 @@ rb_io_close_write(VALUE io) rb_raise(rb_eIOError, "closing non-duplex IO for writing"); } - rb_io_close(write_io); if (io != write_io) { GetOpenFile(io, fptr); fptr->tied_io_for_writing = 0; fptr->mode &= ~FMODE_DUPLEX; } + rb_io_close(write_io); return Qnil; } diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index e424747734..437e7ae5b5 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -1380,6 +1380,19 @@ class TestIO < Test::Unit::TestCase end end + def test_close_read_write_separately + bug = '[ruby-list:49598]' + (1..10).each do |i| + assert_nothing_raised(IOError, "#{bug} trying ##{i}") do + IO.popen(EnvUtil.rubybin, "r+") {|f| + th = Thread.new {f.close_write} + f.close_read + th.join + } + end + end + end + def test_pid r, w = IO.pipe assert_equal(nil, r.pid) |