summaryrefslogtreecommitdiff
path: root/eval_jump.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-12 01:13:40 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-12 01:13:40 (GMT)
commitb19f3a8a1592bf32bd83e02c433715cd67923d1d (patch)
tree1d2f04bd5207326222892ef3e883c846b5dce21e /eval_jump.c
parent90b7ddb89fb5625df1292e766604372ddf26ada1 (diff)
* eval_jump.c (rb_exec_end_proc): remember the latest exit status.
[ruby-core:43173][Bug #5218] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval_jump.c')
-rw-r--r--eval_jump.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/eval_jump.c b/eval_jump.c
index a8f0480..f3a1f78 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