From ffec546b0e522a647c7c2473c40dbe018156736d Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 10 Mar 2019 06:46:28 +0000 Subject: eval.c: clear internal errinfo * eval.c (ruby_cleanup): clear internal error info when invoking end procs. [ruby-core:91731] [Bug #15650] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 1 + test/ruby/test_beginendblock.rb | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/eval.c b/eval.c index 4476390270..1b4b9b1bea 100644 --- a/eval.c +++ b/eval.c @@ -188,6 +188,7 @@ ruby_cleanup(volatile int ex) step_0: step++; errs[1] = th->ec->errinfo; + if (THROW_DATA_P(th->ec->errinfo)) th->ec->errinfo = Qnil; rb_set_safe_level_force(0); ruby_init_stack(&errs[STACK_UPPER(errs, 0, 1)]); diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb index 9238a53354..eb8394864f 100644 --- a/test/ruby/test_beginendblock.rb +++ b/test/ruby/test_beginendblock.rb @@ -154,4 +154,26 @@ class TestBeginEndBlock < Test::Unit::TestCase end end; end + + if defined?(fork) + def test_internal_errinfo_at_exit + # TODO: use other than break-in-fork to throw an internal + # error info. + error, pid, status = IO.pipe do |r, w| + pid = fork do + r.close + STDERR.reopen(w) + at_exit do + $!.class + end + break + end + w.close + [r.read, *Process.wait2(pid)] + end + assert_not_predicate(status, :success?) + assert_not_predicate(status, :signaled?) + assert_match(/unexpected break/, error) + end + end end -- cgit v1.2.3