diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-12 21:05:56 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-12 21:05:56 +0000 |
commit | c4baab077972e4b3e2e55f7c3828097829ad48bb (patch) | |
tree | 040eeda2772506723748d5eedfb07bbbc9086677 | |
parent | a648423e271f7bb24bee730101b3b6d4051cd599 (diff) |
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_5@67233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | eval.c | 1 | ||||
-rw-r--r-- | test/ruby/test_beginendblock.rb | 22 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 26 insertions, 3 deletions
@@ -175,6 +175,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; th->ec->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 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 @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.5.4" -#define RUBY_RELEASE_DATE "2019-03-12" -#define RUBY_PATCHLEVEL 145 +#define RUBY_RELEASE_DATE "2019-03-13" +#define RUBY_PATCHLEVEL 146 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h" |