19991214

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

1 files changed, 4 insertions, 1 deletions

diff --git a/array.c b/array.c
index 2cc9a07c89..6401bc4886 100644
--- a/array.c
+++ b/array.c
@@ -49,7 +49,7 @@ rb_ary_modify(ary)
 	rb_raise(rb_eTypeError, "can't modify frozen array");
     if (FL_TEST(ary, ARY_TMPLOCK))
 	rb_raise(rb_eTypeError, "can't modify array during sort");
-    if (!FL_TEST(ary, FL_TAINT) && rb_safe_level() >= 4)
+    if (!OBJ_TAINTED(ary) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
 }
 
@@ -57,6 +57,9 @@ VALUE
 rb_ary_freeze(ary)
     VALUE ary;
 {
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(ary))
+	rb_raise(rb_eSecurityError, "Insecure: can't freeze array");
+	
     FL_SET(ary, ARY_FREEZE);
     return ary;
 }