diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-08 07:09:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-08 07:09:48 +0000 |
commit | 98932f5150c2e6e26976c9e20b34d79c645e6593 (patch) | |
tree | 43a9cfa2cf7e62ac78f8c055bada6b642ca6a780 /eval.c | |
parent | 49c5a3da6f7d17cb7864eebc564533754725c31d (diff) | |
download | ruby-98932f5150c2e6e26976c9e20b34d79c645e6593.tar.gz |
eval.c: preserve errinfo
* eval.c (rb_ensure): preserve errinfo accross ensure proc before
JUMP_TAG(). [ruby-core:52022] [Bug #7802]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -805,6 +805,8 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE { int state; volatile VALUE result = Qnil; + volatile VALUE errinfo; + rb_thread_t *const th = GET_THREAD(); PUSH_TAG(); if ((state = EXEC_TAG()) == 0) { @@ -813,7 +815,9 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE POP_TAG(); /* TODO: fix me */ /* retval = prot_tag ? prot_tag->retval : Qnil; */ /* save retval */ + errinfo = th->errinfo; (*e_proc) (data2); + th->errinfo = errinfo; if (state) JUMP_TAG(state); return result; |