kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

eval.c: clear internal errinfo

Browse source 
* 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
This commit is contained in:
nobu 2019-03-10 06:46:28 +00:00
parent 72df0a8e47
commit ffec546b0e
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
eval.c
View file

@ -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)]);

22
test/ruby/test_beginendblock.rb
View file

@ -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