merge revision(s) 17581:

	* eval.c (rb_call0): wrong condition to check insecure method.
	  a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.


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

3 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index c47748c0c0..7b1979875e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Sun Jun 29 18:26:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* variable.c (rb_f_trace_var): should not be allowed at safe level 4.  
 	  a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
 
+	* eval.c (rb_call0): wrong condition to check insecure method.
+	  a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
+
 Sun Jun 29 18:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (rb_ary_fill): not depend on unspecified behavior at integer
diff --git a/eval.c b/eval.c
index ff163eba6b..944b819ef9 100644
--- a/eval.c
+++ b/eval.c
@@ -5828,8 +5828,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
     TMP_PROTECT;
     volatile int safe = -1;
 
-    if (NOEX_SAFE(flags) > ruby_safe_level &&
-	ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
+    if (NOEX_SAFE(flags) > ruby_safe_level && NOEX_SAFE(flags) > 2) {
 	rb_raise(rb_eSecurityError, "calling insecure method: %s",
 		 rb_id2name(id));
     }
diff --git a/version.h b/version.h
index 449e020eb6..4114294a0e 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 32
+#define RUBY_PATCHLEVEL 33
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8