From bdfe0b8f18dc5642fbd8d50561c8e930cc18645d Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 19 Mar 2008 14:52:43 +0000 Subject: * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) 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 + + * 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 * 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); } -- cgit v1.2.3