nobu	2012-02-22 17:36:25 +0900 (Wed, 22 Feb 2012)

  New Revision: 34736

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34736

  Log:
    * io.c (rb_io_s_foreach): argument check before making Enumerator.
      [ruby-dev:31525]

  Modified files:
    trunk/ChangeLog
    trunk/io.c
    trunk/test/ruby/test_io.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34735)
+++ ChangeLog	(revision 34736)
@@ -1,3 +1,8 @@
+Wed Feb 22 17:36:22 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (rb_io_s_foreach): argument check before making Enumerator.
+	  [ruby-dev:31525]
+
 Wed Feb 22 17:07:35 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_s_foreach): return enumerator including kerword
Index: io.c
===================================================================
--- io.c	(revision 34735)
+++ io.c	(revision 34736)
@@ -8969,10 +8969,11 @@
 rb_io_s_foreach(int argc, VALUE *argv, VALUE self)
 {
     VALUE opt;
+    int orig_argc = argc;
     struct foreach_arg arg;
 
-    RETURN_ENUMERATOR(self, argc, argv);
     argc = rb_scan_args(argc, argv, "13:", NULL, NULL, NULL, NULL, &opt);
+    RETURN_ENUMERATOR(self, orig_argc, argv);
     open_key_args(argc, argv, opt, &arg);
     if (NIL_P(arg.io)) return Qnil;
     return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io);
Index: test/ruby/test_io.rb
===================================================================
--- test/ruby/test_io.rb	(revision 34735)
+++ test/ruby/test_io.rb	(revision 34736)
@@ -1605,6 +1605,13 @@
     IO.foreach(t.path, "b", 3) {|x| a << x }
     assert_equal(["foo", "\nb", "ar\n", "b", "az\n"], a)
 
+    bug = '[ruby-dev:31525]'
+    assert_raise(ArgumentError, bug) {IO.foreach}
+
+    a = nil
+    assert_nothing_raised(ArgumentError, bug) {a = IO.foreach(t.path).to_a}
+    assert_equal(["foo\n", "bar\n", "baz\n"], a, bug)
+
     bug6054 = '[ruby-dev:45267]'
     e = assert_raise(IOError, bug6054) {IO.foreach(t.path, mode:"w").next}
     assert_match(/not opened for reading/, e.message, bug6054)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/