diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval_jump.c | 5 | ||||
| -rw-r--r-- | test/ruby/test_beginendblock.rb | 13 |
3 files changed, 23 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon Mar 12 10:13:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval_jump.c (rb_exec_end_proc): remember the latest exit status. + [ruby-core:43173][Bug #5218] + Mon Mar 12 07:33:12 2012 Tanaka Akira <akr@fsij.org> * lib/tmpdir.rb: update document for changing diff --git a/eval_jump.c b/eval_jump.c index a8f04808ca..f3a1f78a3f 100644 --- a/eval_jump.c +++ b/eval_jump.c @@ -99,6 +99,8 @@ rb_exec_end_proc(void) struct end_proc_data *volatile link; int status; volatile int safe = rb_safe_level(); + rb_thread_t *th = GET_THREAD(); + VALUE errinfo = th->errinfo; while (ephemeral_end_procs) { link = ephemeral_end_procs; @@ -112,6 +114,7 @@ rb_exec_end_proc(void) POP_TAG(); if (status) { error_handle(status); + if (!NIL_P(th->errinfo)) errinfo = th->errinfo; } xfree(link); } @@ -128,10 +131,12 @@ rb_exec_end_proc(void) POP_TAG(); if (status) { error_handle(status); + if (!NIL_P(th->errinfo)) errinfo = th->errinfo; } xfree(link); } rb_set_safe_level_force(safe); + th->errinfo = errinfo; } void diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb index 18649ffbd4..7172aec4e1 100644 --- a/test/ruby/test_beginendblock.rb +++ b/test/ruby/test_beginendblock.rb @@ -148,4 +148,17 @@ EOW assert_in_out_err(t.path, "", expected, [], "[ruby-core:35237]") t.close end + + def test_rescue_at_exit + bug5218 = '[ruby-core:43173][Bug #5218]' + cmd = [ + "raise 'X' rescue nil", + "nil", + "exit(42)", + ] + %w[at_exit END].each do |ex| + out, err, status = EnvUtil.invoke_ruby(cmd.map {|s|["-e", "#{ex} {#{s}}"]}.flatten, "", true, true) + assert_equal(["", "", 42], [out, err, status.exitstatus], "#{bug5218}: #{ex}") + end + end end |