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

* io.c (argf_getpartial): should not resize str if the second

Browse Source 
argument is not given.
  [ruby-core:71668] [Bug #11738]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2015-11-25 01:57:48 +00:00
parent ff838167ba
commit 94da8b1737
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Nov 25 10:55:21 2015 Shugo Maeda <shugo@ruby-lang.org>
* io.c (argf_getpartial): should not resize str if the second
argument is not given.
[ruby-core:71668] [Bug #11738]
Tue Nov 24 23:56:25 2015 Naohisa Goto <ngotogenome@gmail.com> Tue Nov 24 23:56:25 2015 Naohisa Goto <ngotogenome@gmail.com>
* configure.in: On Solaris, it is safe to define _LARGEFILE_SOURCE * configure.in: On Solaris, it is safe to define _LARGEFILE_SOURCE

4
io.c
View File

@ -11247,7 +11247,9 @@ argf_getpartial(int argc, VALUE *argv, VALUE argf, VALUE opts, int nonblock)
} }
if (!next_argv()) { if (!next_argv()) {
rb_str_resize(str, 0); if (!NIL_P(str)) {
rb_str_resize(str, 0);
}
rb_eof_error(); rb_eof_error();
} }
if (ARGF_GENERIC_INPUT_P()) { if (ARGF_GENERIC_INPUT_P()) {

11
test/ruby/test_argf.rb
View File

@ -510,6 +510,17 @@ class TestArgf < Test::Unit::TestCase
end end
end end
def test_readpartial_eof_twice
ruby('-W1', '-e', <<-SRC, @t1.path) do |f|
$stderr = $stdout
print ARGF.readpartial(256)
ARGF.readpartial(256) rescue p($!.class)
ARGF.readpartial(256) rescue p($!.class)
SRC
assert_equal("1\n2\nEOFError\nEOFError\n", f.read)
end
end
def test_getc def test_getc
ruby('-e', <<-SRC, @t1.path, @t2.path, @t3.path) do |f| ruby('-e', <<-SRC, @t1.path, @t2.path, @t3.path) do |f|
s = "" s = ""