kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

io.c: ARGF fd leak

Browse source 
* io.c (argf_next_argv): fix leak of fd after breaking in #each
  method.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-27 07:18:27 +00:00
parent bc855ef139
commit 2fbc63b8a8
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
io.c
View file

@ -8023,6 +8023,7 @@ argf_next_argv(VALUE argf)
}
if (ARGF.next_p == 1) {
if (ARGF.init_p == 1) argf_close(argf);
retry:
if (RARRAY_LEN(ARGF.argv) > 0) {
VALUE filename = rb_ary_shift(ARGF.argv);

8
test/ruby/test_argf.rb
View file

@ -137,7 +137,7 @@ class TestArgf < Test::Unit::TestCase
INPUT
end
def test_new_lineno
def test_new_lineno_each
f = ARGF.class.new(@t1.path, @t2.path, @t3.path)
result = []
f.each {|line| result << [f.lineno, line]; break if result.size == 3}
@ -146,10 +146,16 @@ class TestArgf < Test::Unit::TestCase
f.rewind
assert_equal(2, f.lineno)
ensure
f.close
end
def test_new_lineno_each_char
f = ARGF.class.new(@t1.path, @t2.path, @t3.path)
f.each_char.to_a
assert_equal(0, f.lineno)
ensure
f.close
end
def test_inplace