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

io.c: pipe_register_fptr

Browse Source 
* io.c (pipe_register_fptr): get rid of double registration which
  causes access after free and segfault.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-01-31 04:24:57 +00:00
parent 80d74ea732
commit 1d5847d1af
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
io.c
View File

@ -6194,6 +6194,20 @@ pipe_finalize(rb_io_t *fptr, int noraise)
#endif #endif
pipe_del_fptr(fptr); pipe_del_fptr(fptr);
} }
static void
pipe_register_fptr(rb_io_t *fptr)
{
struct pipe_list *list;
if (fptr->finalize != pipe_finalize) return;
for (list = pipe_list; list; list = list->next) {
if (list->fptr == fptr) return;
}
pipe_add_fptr(fptr);
}
#endif #endif
void void
@ -7146,8 +7160,7 @@ io_reopen(VALUE io, VALUE nfile)
else if (!IS_PREP_STDIO(fptr)) fptr->pathv = Qnil; else if (!IS_PREP_STDIO(fptr)) fptr->pathv = Qnil;
fptr->finalize = orig->finalize; fptr->finalize = orig->finalize;
#if defined (__CYGWIN__) || !defined(HAVE_WORKING_FORK) #if defined (__CYGWIN__) || !defined(HAVE_WORKING_FORK)
if (fptr->finalize == pipe_finalize) pipe_register_fptr(fptr);
pipe_add_fptr(fptr);
#endif #endif
fd = fptr->fd; fd = fptr->fd;
@ -7329,8 +7342,7 @@ rb_io_init_copy(VALUE dest, VALUE io)
if (!NIL_P(orig->pathv)) fptr->pathv = orig->pathv; if (!NIL_P(orig->pathv)) fptr->pathv = orig->pathv;
fptr->finalize = orig->finalize; fptr->finalize = orig->finalize;
#if defined (__CYGWIN__) || !defined(HAVE_WORKING_FORK) #if defined (__CYGWIN__) || !defined(HAVE_WORKING_FORK)
if (fptr->finalize == pipe_finalize) pipe_register_fptr(fptr);
pipe_add_fptr(fptr);
#endif #endif
fd = ruby_dup(orig->fd); fd = ruby_dup(orig->fd);

9
test/ruby/test_process.rb
View File

@ -1810,6 +1810,15 @@ class TestProcess < Test::Unit::TestCase
end end
end end
def test_popen_reopen
assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
begin;
io = File.open(IO::NULL)
IO.popen("echo") {|f| io.reopen(f)}
io.reopen(io.dup)
end;
end
def test_execopts_new_pgroup def test_execopts_new_pgroup
return unless windows? return unless windows?