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

Fix ARGF.read(length) short read [Bug #18074]

Browse source
This commit is contained in:
Csaba Henk 2021-08-10 01:07:06 +02:00 • committed by Nobuyoshi Nakada
parent 510c3655c9
commit 8df1ace64a
Notes: git 2021-08-10 11:33:08 +09:00
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
io.c
View file

@ -12512,8 +12512,7 @@ argf_read(int argc, VALUE *argv, VALUE argf)
else if (argc >= 1) { else if (argc >= 1) {
long slen = RSTRING_LEN(str); long slen = RSTRING_LEN(str);
if (slen < len) { if (slen < len) {
len -= slen; argv[0] = LONG2NUM(len - slen);
argv[0] = LONG2NUM(len);
goto retry; goto retry;
} }
} }

9
test/ruby/test_argf.rb
View file

@ -1110,4 +1110,13 @@ class TestArgf < Test::Unit::TestCase
assert_raise(TypeError, bug11610) {gets} assert_raise(TypeError, bug11610) {gets}
}; };
end end
def test_sized_read
[@t1, @t2, @t3].each { |t|
open(t.path, "wb") { |f| f.write "t" }
}
ruby('-e', "print ARGF.read(3).size", @t1.path, @t2.path, @t3.path) do |f|
assert_equal("3", f.read)
end
end
end end