diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 10:56:00 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 10:56:00 +0000 |
commit | 391fc1e8d9e1625c06c50e9f5b66d624e183200a (patch) | |
tree | 830453915e16af16916cd1c97f0e29f855c8b907 /io.c | |
parent | 1b7c7c5c44cc7942290309690d6b7d598fc312eb (diff) |
merges r24271 from trunk into ruby_1_9_1.
--
* io.c (argf_eof): should not have reached EOF before trying to
read. based on a patch by Heesob Park <phasis AT gmail.com> at
[ruby-core:24559]. [ruby-core:24557]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -8041,7 +8041,7 @@ argf_to_io(VALUE argf) static VALUE argf_eof(VALUE argf) { - if (ARGF.current_file) { + if (RTEST(ARGF.current_file)) { if (ARGF.init_p == 0) return Qtrue; ARGF_FORWARD(0, 0); if (rb_io_eof(ARGF.current_file)) { |