mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* eval.c (rb_protect): restore cfp ([ruby-dev:30671]).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
baeb828c03
commit
cc3871f9dc
2 changed files with 8 additions and 0 deletions
|
@ -1,3 +1,7 @@
|
|||
Thu Apr 12 16:06:48 2007 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* eval.c (rb_protect): restore cfp ([ruby-dev:30671]).
|
||||
|
||||
Thu Apr 12 16:04:31 2007 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* compile.c (iseq_compile_each): check node->nd_state == 1, not !0.
|
||||
|
|
4
eval.c
4
eval.c
|
@ -1390,16 +1390,20 @@ rb_protect(VALUE (*proc) (VALUE), VALUE data, int *state)
|
|||
{
|
||||
VALUE result = Qnil; /* OK */
|
||||
int status;
|
||||
rb_thread_t *th = GET_THREAD();
|
||||
rb_control_frame_t *cfp = th->cfp;
|
||||
|
||||
PUSH_THREAD_TAG();
|
||||
if ((status = EXEC_TAG()) == 0) {
|
||||
result = (*proc) (data);
|
||||
}
|
||||
POP_THREAD_TAG();
|
||||
|
||||
if (state) {
|
||||
*state = status;
|
||||
}
|
||||
if (status != 0) {
|
||||
th->cfp = cfp;
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue