diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | io.c | 13 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 24 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 45 insertions, 5 deletions
@@ -1,3 +1,14 @@ +Sat Oct 5 02:14:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (rb_io_close_read): duplex IO should wait its child process + even after close_read. + +Sat Oct 5 02:14:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 + rid of potential memory/fd leak. + Sat Oct 5 01:59:50 2013 Shugo Maeda <shugo@ruby-lang.org> * vm_method.c (rb_undef): raise a NameError if the original method @@ -4369,11 +4369,16 @@ rb_io_close_read(VALUE io) write_io = GetWriteIO(io); if (io != write_io) { rb_io_t *wfptr; - rb_io_fptr_cleanup(fptr, FALSE); GetOpenFile(write_io, wfptr); + wfptr->pid = fptr->pid; + fptr->pid = 0; RFILE(io)->fptr = wfptr; - RFILE(write_io)->fptr = NULL; - rb_io_fptr_finalize(fptr); + /* bind to write_io temporarily to get rid of memory/fd leak */ + fptr->tied_io_for_writing = 0; + fptr->mode &= ~FMODE_DUPLEX; + RFILE(write_io)->fptr = fptr; + rb_io_fptr_cleanup(fptr, FALSE); + /* should not finalize fptr because another thread may be reading it */ return Qnil; } @@ -4429,12 +4434,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 e0dfb24ba6..e7384390be 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -1218,6 +1218,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) @@ -1234,6 +1247,17 @@ class TestIO < Test::Unit::TestCase assert_raise(IOError) { pipe.pid } end + def tesst_pid_after_close_read + pid1 = pid2 = nil + IO.popen(["echo", ""], "r+") do |io| + pid1 = io.pid + io.close_read + pid2 = io.pid + end + assert_not_nil(pid1) + assert_equal(pid1, pid2) + end + def make_tempfile t = Tempfile.new("test_io") t.binmode @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-10-05" -#define RUBY_PATCHLEVEL 325 +#define RUBY_PATCHLEVEL 326 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 10 |