From f0d8be4e2bac9d46126bbc43650e3a0e030da252 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 2 Oct 2013 05:20:02 +0000 Subject: io.c: get rid of race condition * io.c (rb_io_close_write): detach tied IO for writing before closing to get rid of race condition. [ruby-list:49598] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- io.c | 2 +- test/ruby/test_io.rb | 13 +++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a70d3f6e0..086e8801d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Wed Oct 2 14:18:56 2013 Nobuyoshi Nakada +Wed Oct 2 14:19:57 2013 Nobuyoshi Nakada + + * 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 diff --git a/io.c b/io.c index 053d34f931..15fc799d69 100644 --- a/io.c +++ b/io.c @@ -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) -- cgit v1.2.3