From 01eb117b01576e5b8386af5b6b425655f314888c Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 1 Dec 2012 10:24:12 +0000
Subject: [PATCH] io.c: recurse for the argument

* io.c (rb_io_puts): recurse for the argument itself, not converted
  array elements.  [ruby-core:42444] [Bug #5986]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            |  5 +++++
 io.c                 | 10 +++++-----
 test/ruby/test_io.rb | 12 ++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ccf768e4e5..d5d1af45f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec  1 19:24:09 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_puts): recurse for the argument itself, not converted
+	  array elements.  [ruby-core:42444] [Bug #5986]
+
 Sat Dec  1 19:01:36 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (w_object, r_object0): call private marshal methods.
diff --git a/io.c b/io.c
index 63bb8a00e7..7a89654ba2 100644
--- a/io.c
+++ b/io.c
@@ -6660,13 +6660,15 @@ io_puts_ary(VALUE ary, VALUE out, int recur)
     if (recur) {
 	tmp = rb_str_new2("[...]");
 	rb_io_puts(1, &tmp, out);
-	return Qnil;
+	return Qtrue;
     }
+    ary = rb_check_array_type(ary);
+    if (NIL_P(ary)) return Qfalse;
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	tmp = RARRAY_PTR(ary)[i];
 	rb_io_puts(1, &tmp, out);
     }
-    return Qnil;
+    return Qtrue;
 }
 
 /*
@@ -6705,9 +6707,7 @@ rb_io_puts(int argc, VALUE *argv, VALUE out)
 	    line = argv[i];
 	    goto string;
 	}
-	line = rb_check_array_type(argv[i]);
-	if (!NIL_P(line)) {
-	    rb_exec_recursive(io_puts_ary, line, out);
+	if (rb_exec_recursive(io_puts_ary, argv[i], out)) {
 	    continue;
 	}
 	line = rb_obj_as_string(argv[i]);
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index d0924844b1..d509a9bfe2 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -2583,5 +2583,17 @@ End
       end
     end
   end
+
+  def test_puts_recursive_ary
+    bug5986 = '[ruby-core:42444]'
+    c = Class.new {
+      def to_ary
+        [self]
+      end
+    }
+    s = StringIO.new
+    s.puts(c.new)
+    assert_equal("[...]\n", s.string, bug5986)
+  end
 end