2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 626d59abda..7519787c35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 19 23:52:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_putc, rb_io_puts): ouput directly if the reciever is
+	  rb_stdout to get rid of infinite recursion.  [ruby-dev:34059]
+
 Wed Mar 19 22:27:41 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* rational.c: added rb_gcd.
diff --git a/io.c b/io.c
index 1f2af9fb25..cd1c590c41 100644
--- a/io.c
+++ b/io.c
@@ -4485,6 +4485,9 @@ rb_io_putc(VALUE io, VALUE ch)
 static VALUE
 rb_f_putc(VALUE recv, VALUE ch)
 {
+    if (recv == rb_stdout) {
+	return rb_io_putc(recv, ch);
+    }
     return rb_funcall2(rb_stdout, rb_intern("putc"), 1, &ch);
 }
 
@@ -4562,8 +4565,11 @@ rb_io_puts(int argc, VALUE *argv, VALUE out)
  */
 
 static VALUE
-rb_f_puts(int argc, VALUE *argv)
+rb_f_puts(int argc, VALUE *argv, VALUE recv)
 {
+    if (recv == rb_stdout) {
+	return rb_io_puts(argc, argv, recv);
+    }
     return rb_funcall2(rb_stdout, rb_intern("puts"), argc, argv);
 }