From 43449fb9956d568800ed62b326e478b027efe579 Mon Sep 17 00:00:00 2001 From: usa Date: Sun, 4 Apr 2021 22:24:29 +0000 Subject: merge revision(s) 579645d9: [Backport #17033] Fixed infinite loop at error in printing cause [Bug #17033] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval_error.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'eval_error.c') diff --git a/eval_error.c b/eval_error.c index 8ea58a4742..c2d33ef498 100644 --- a/eval_error.c +++ b/eval_error.c @@ -308,6 +308,7 @@ rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo) volatile uint8_t raised_flag = ec->raised_flag; volatile VALUE errat = Qundef; volatile VALUE emesg = Qundef; + volatile bool written = false; if (NIL_P(errinfo)) return; @@ -322,7 +323,10 @@ rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo) emesg = rb_get_message(errinfo); } - rb_error_write(errinfo, emesg, errat, Qnil, Qnil, Qnil); + if (!written) { + written = true; + rb_error_write(errinfo, emesg, errat, Qnil, Qnil, Qfalse); + } EC_POP_TAG(); ec->errinfo = errinfo; -- cgit v1.2.3