diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-03 12:53:18 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-03 12:53:18 +0000 |
commit | c7159e81fc0d70b67358deaa39d21babbc3d89e7 (patch) | |
tree | 6b6f6a59ca6427dec2e183cc384edbbb886a6289 /vm_eval.c | |
parent | 1083b375ec4bf8cb434d73c5f8c3370472e3bfe6 (diff) | |
download | ruby-c7159e81fc0d70b67358deaa39d21babbc3d89e7.tar.gz |
vm_eval.c: rb_catch_protect
* vm_eval.c (rb_catch_protect): new function similar to
rb_catch_obj(), but protect from all global jumps like as
rb_load_protect(), rb_protect(), etc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -1834,6 +1834,16 @@ VALUE rb_catch_obj(VALUE t, VALUE (*func)(), VALUE data) { int state; + VALUE val = rb_catch_protect(t, func, data, &state); + if (state) + JUMP_TAG(state); + return val; +} + +VALUE +rb_catch_protect(VALUE t, rb_block_call_func *func, VALUE data, int *stateptr) +{ + int state; volatile VALUE val = Qnil; /* OK */ rb_thread_t *th = GET_THREAD(); rb_control_frame_t *saved_cfp = th->cfp; @@ -1845,7 +1855,7 @@ rb_catch_obj(VALUE t, VALUE (*func)(), VALUE data) if ((state = TH_EXEC_TAG()) == 0) { /* call with argc=1, argv = [tag], block = Qnil to insure compatibility */ - val = (*func)(tag, data, 1, &tag, Qnil); + val = (*func)(tag, data, 1, (const VALUE *)&tag, Qnil); } else if (state == TAG_THROW && RNODE(th->errinfo)->u1.value == tag) { th->cfp = saved_cfp; @@ -1854,8 +1864,8 @@ rb_catch_obj(VALUE t, VALUE (*func)(), VALUE data) state = 0; } TH_POP_TAG(); - if (state) - JUMP_TAG(state); + if (stateptr) + *stateptr = state; return val; } |