diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-04-04 22:24:29 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-04-04 22:24:29 +0000 |
commit | 43449fb9956d568800ed62b326e478b027efe579 (patch) | |
tree | 94d09f7bdae4d5458febc37d053e62ee8148d31d | |
parent | f56a213a99655616a21ace3b354aa868ca2dff70 (diff) |
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
-rw-r--r-- | eval_error.c | 6 | ||||
-rw-r--r-- | test/ruby/test_exception.rb | 20 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 29 insertions, 5 deletions
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; diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 05c74f6dcd..de249c9b7c 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -842,6 +842,26 @@ end.join } end + def test_cause_exception_in_cause_message + assert_in_out_err([], "#{<<~"begin;"}\n#{<<~'end;'}") do |outs, errs, status| + begin; + exc = Class.new(StandardError) do + def initialize(obj, cnt) + super(obj) + @errcnt = cnt + end + def to_s + return super if @errcnt <= 0 + @errcnt -= 1 + raise "xxx" + end + end.new("ok", 10) + raise "[Bug #17033]", cause: exc + end; + assert_equal(1, errs.count {|m| m.include?("[Bug #17033]")}, proc {errs.pretty_inspect}) + end + end + def test_anonymous_message assert_in_out_err([], "raise Class.new(RuntimeError), 'foo'", [], /foo\n/) end @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.6.7" -#define RUBY_RELEASE_DATE "2021-03-02" -#define RUBY_PATCHLEVEL 172 +#define RUBY_RELEASE_DATE "2021-04-05" +#define RUBY_PATCHLEVEL 173 #define RUBY_RELEASE_YEAR 2021 -#define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_MONTH 4 +#define RUBY_RELEASE_DAY 5 #include "ruby/version.h" |