diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-18 07:48:28 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-18 07:48:28 +0000 |
commit | 2c5ae0eebad1397653f5dac5982cd5eba14ff35d (patch) | |
tree | 2f93c0df2168646ccd3f3aca3452bb1a06c182bb | |
parent | 115a3d21e49a887f615b2b85c3eb4dd11701ab51 (diff) | |
download | ruby-2c5ae0eebad1397653f5dac5982cd5eba14ff35d.tar.gz |
* insnhelper.ci (vm_call_bmethod),
vm.c (vm_invoke_proc_core): fix to do not restore
$SAFE when proc invoked by bmethod.
* vm_core.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | insnhelper.ci | 2 | ||||
-rw-r--r-- | vm.c | 16 | ||||
-rw-r--r-- | vm_core.h | 1 |
4 files changed, 23 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Sat Aug 18 16:44:15 2007 Koichi Sasada <ko1@atdot.net> + + * insnhelper.ci (vm_call_bmethod), + vm.c (vm_invoke_proc_core): fix to do not restore + $SAFE when proc invoked by bmethod. + + * vm_core.h: ditto. + Sat Aug 18 16:44:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval_error.ci (ruby_error_print): call error_print. diff --git a/insnhelper.ci b/insnhelper.ci index 500005c9ce..b65190812a 100644 --- a/insnhelper.ci +++ b/insnhelper.ci @@ -388,7 +388,7 @@ vm_call_bmethod(rb_thread_t *th, ID id, VALUE procval, VALUE recv, (cfp-2)->method_klass = klass; GetProcPtr(procval, proc); - val = vm_invoke_proc(th, proc, recv, argc, argv); + val = vm_invoke_proc_core(th, proc, recv, argc, argv, 0); return val; } @@ -606,8 +606,8 @@ vm_yield(rb_thread_t *th, int argc, VALUE *argv) } VALUE -vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, - VALUE self, int argc, VALUE *argv) +vm_invoke_proc_core(rb_thread_t *th, rb_proc_t *proc, + VALUE self, int argc, VALUE *argv, int restore_safe) { VALUE val = Qundef; int state; @@ -623,7 +623,10 @@ vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, } TH_POP_TAG(); - th->safe_level = stored_safe; + if (restore_safe) { + th->safe_level = stored_safe; + } + lfp_set_special_cref(proc->block.lfp, (NODE*)stored_special_cref_stack); if (state) { @@ -647,6 +650,13 @@ vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, return val; } +VALUE +vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, + VALUE self, int argc, VALUE *argv) +{ + return vm_invoke_proc_core(th, proc, self, argc, argv, 1); +} + /* special variable */ VALUE @@ -616,6 +616,7 @@ int rb_thread_method_id_and_klass(rb_thread_t *th, ID *idp, VALUE *klassp); VALUE vm_eval_body(rb_thread_t *th); VALUE vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self, int argc, VALUE *argv); +VALUE vm_invoke_proc_core(rb_thread_t *th, rb_proc_t *proc, VALUE self, int argc, VALUE *argv, int restore_flag); VALUE vm_make_proc(rb_thread_t *th, rb_control_frame_t *cfp, rb_block_t *block); VALUE vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp); VALUE vm_backtrace(rb_thread_t *, int); |