* eval.c (rb_call0): wrong condition for $SAFE restoration.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 739d5a0cf1..548c6f58c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep  1 17:11:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): wrong condition for $SAFE restoration.
+
 Thu Sep  1 14:12:45 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't 
@@ -15,7 +19,7 @@ Wed Aug 31 14:41:30 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 Wed Aug 31 10:36:09 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* process.c (proc_detach, proc_setmaxgroups): missing argument type
-	  declaration. (I recomment ANSI-style function)
+	  declaration. (I recommend ANSI-style function)
 
 Wed Aug 31 06:59:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
diff --git a/eval.c b/eval.c
index 9008e88eb8..c52d889d62 100644
--- a/eval.c
+++ b/eval.c
@@ -5959,7 +5959,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	    POP_CLASS();
 	    POP_SCOPE();
 	    ruby_cref = saved_cref;
-	    if (safe > 0) ruby_safe_level = safe;
+	    if (safe >= 0) ruby_safe_level = safe;
 	    if (event_hooks) {
 		EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
 	    }