* io.c (rb_io_s_binread): offset argument was wrongly passed to

  internal IO#read call.  [ruby-core:18810]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 21f31765f..7832ce273 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 48b1025c6..f5e0b0d76 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);
     }