aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-24 02:31:12 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-24 02:31:12 +0000
commit9bf27f6b1745e7f91eb3789aba0e229950dabab4 (patch)
treed605104dc242c5463cdeb33a6455728c64d4e3a8
parent705b8b41eb5b01d6ce626e598c7116d0596bd5ba (diff)
downloadruby-9bf27f6b1745e7f91eb3789aba0e229950dabab4.tar.gz
* io.c (rb_io_s_binread): offset argument was wrongly passed to
internal IO#read call. [ruby-core:18810] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 21f31765f7..7832ce273f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 24 11:18:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_s_binread): offset argument was wrongly passed to
+ internal IO#read call. [ruby-core:18810]
+
Wed Sep 24 07:38:23 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
* vm_core.h: ruby/ruby.h should be included at the very first
diff --git a/io.c b/io.c
index 48b1025c63..f5e0b0d769 100644
--- a/io.c
+++ b/io.c
@@ -7006,7 +7006,7 @@ rb_io_s_binread(int argc, VALUE *argv, VALUE io)
arg.io = rb_io_open(argv[0], rb_str_new_cstr("rb:ASCII-8BIT"), Qnil, Qnil);
if (NIL_P(arg.io)) return Qnil;
arg.argv = argv+1;
- arg.argc = (argc > 2) ? 2 : argc;
+ arg.argc = (argc > 1) ? 1 : 0;
if (!NIL_P(offset)) {
rb_io_seek(arg.io, offset, SEEK_SET);
}