From cd3ac6fef3422b597ef50f51d8cb5e61e8d021a8 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 29 Jun 2008 09:29:45 +0000 Subject: merge revision(s) 17581: * eval.c (rb_call0): wrong condition to check insecure method. a patch from Keita Yamaguchi . git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 3 +++ eval.c | 3 +-- version.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6567a1712..23d8bddad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ Sun Jun 29 18:25:03 2008 Yukihiro Matsumoto * variable.c (rb_f_trace_var): should not be allowed at safe level 4. a patch from Keita Yamaguchi . + * eval.c (rb_call0): wrong condition to check insecure method. + a patch from Keita Yamaguchi . + Sun Jun 29 18:24:13 2008 Nobuyoshi Nakada * array.c (rb_ary_fill): not depend on unspecified behavior at integer diff --git a/eval.c b/eval.c index 7fc15bca3..54d15af8f 100644 --- a/eval.c +++ b/eval.c @@ -5794,8 +5794,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 402fd74a0..3365ea307 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-29" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080629 -#define RUBY_PATCHLEVEL 249 +#define RUBY_PATCHLEVEL 250 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit