summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-03-10 06:46:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-03-10 06:46:28 +0000
commitffec546b0e522a647c7c2473c40dbe018156736d (patch)
treec2c1f3fbfb570bb0cda1fb5ac497f9017561d3e9
parent72df0a8e4703c4e14cb2014d59d8ddad09a47859 (diff)
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
-rw-r--r--eval.c1
-rw-r--r--test/ruby/test_beginendblock.rb22
2 files changed, 23 insertions, 0 deletions
diff --git a/eval.c b/eval.c
index 4476390..1b4b9b1 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 9238a53..eb83948 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