2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f56b12eb96..2658d1f7ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 25 15:52:40 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (vm_invoke_proc): skip setting safe_level if
+	  it from bmethod.  This change makes test/ruby/test_proc.rb pass.
+
 Fri Jul 25 10:00:00 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* test/ruby/test_transcode.rb: refactoring/cleanup of
diff --git a/vm.c b/vm.c
index 6379bdfd89..5778cfe42a 100644
--- a/vm.c
+++ b/vm.c
@@ -513,7 +513,9 @@ vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self,
 
     TH_PUSH_TAG(th);
     if ((state = EXEC_TAG()) == 0) {
-	th->safe_level = proc->safe_level;
+	if (!proc->is_from_method) {
+	    th->safe_level = proc->safe_level;
+	}
 	val = invoke_block_from_c(th, &proc->block, self, argc, argv, blockptr, 0);
     }
     TH_POP_TAG();