[macruby-changes] [5060] MacRuby/trunk/array.h

[source_changes at macosforge.org]

Revision: 5060
          http://trac.macosforge.org/projects/ruby/changeset/5060
Author:   watson1978 at gmail.com
Date:     2010-12-20 20:20:20 -0800 (Mon, 20 Dec 2010)
Log Message:
-----------
More method of Array will throw a SecurityError when $SAFE is 4.

Test Script:
{{{
a = [1, 2]
$SAFE = 4
a.pop
}}}

Modified Paths:
--------------
    MacRuby/trunk/array.h

Modified: MacRuby/trunk/array.h
===================================================================
--- MacRuby/trunk/array.h	2010-12-20 22:30:11 UTC (rev 5059)
+++ MacRuby/trunk/array.h	2010-12-21 04:20:20 UTC (rev 5060)
@@ -44,14 +44,11 @@
 static inline void
 rary_modify(VALUE ary)
 {
-    const long mask = RBASIC(ary)->flags;
-    if ((mask & FL_FREEZE) == FL_FREEZE) {
-	rb_raise(rb_eRuntimeError, "can't modify frozen/immutable array");
+    if (OBJ_FROZEN(ary)) {
+	rb_error_frozen("array");
     }
-    if ((mask & FL_TAINT) == FL_TAINT) {
-	if (rb_safe_level() >= 4) {
-	    rb_raise(rb_eSecurityError, "Insecure: can't modify array");
-	}
+    if (!OBJ_UNTRUSTED(ary) && rb_safe_level() >= 4) {
+	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101220/528b4449/attachment-0001.html>