From c0404b8cde7eefbc6405ba39559a50dd83888f46 Mon Sep 17 00:00:00 2001 From: usa Date: Sun, 31 Mar 2019 15:01:13 +0000 Subject: [PATCH] merge revision(s) 67201: [Backport #15650] 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/branches/ruby_2_4@67392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 1 + test/ruby/test_beginendblock.rb | 22 ++++++++++++++++++++++ version.h | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/eval.c b/eval.c index 617cb6f1be..8be12ecd84 100644 --- a/eval.c +++ b/eval.c @@ -173,6 +173,7 @@ ruby_cleanup(volatile int ex) step_0: step++; errs[1] = th->errinfo; + if (THROW_DATA_P(th->errinfo)) th->errinfo = Qnil; th->safe_level = 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 a09c963b3c..4c00c43a0b 100644 --- a/test/ruby/test_beginendblock.rb +++ b/test/ruby/test_beginendblock.rb @@ -148,4 +148,26 @@ EOS 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 diff --git a/version.h b/version.h index 80b9aa2070..ff1f89cbdf 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.6" #define RUBY_RELEASE_DATE "2019-03-31" -#define RUBY_PATCHLEVEL 353 +#define RUBY_PATCHLEVEL 354 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 3