4 files changed, 23 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index faa1842856..448b8ad811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;
 }
 
diff --git a/vm.c b/vm.c
index e65918a4a9..8cb97eead0 100644
--- a/vm.c
+++ b/vm.c
@@ -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
diff --git a/vm_core.h b/vm_core.h
index 568b7b390e..c2bdc6e52a 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -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);