From f433d710d0ab3b367cc4a851cdfb81c5405bb7f8 Mon Sep 17 00:00:00 2001 From: shugo Date: Wed, 13 Aug 2008 07:25:05 +0000 Subject: * object.c (rb_obj_untrusted): new method Object#untrusted?. (rb_obj_untrust): new method Object#untrust. (rb_obj_trust): new method Object#trust. * array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c, string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c, ruby.c, marshal.c: fixes for Object#untrusted?. * test/ruby/test_module.rb, test/ruby/test_array.rb, test/ruby/test_object.rb, test/ruby/test_string.rb, test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for Object#untrusted?. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- variable.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'variable.c') diff --git a/variable.c b/variable.c index 476220aa4b..48de287408 100644 --- a/variable.c +++ b/variable.c @@ -995,7 +995,7 @@ rb_ivar_set(VALUE obj, ID id, VALUE val) long i, len; int ivar_extended; - if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) + if (!OBJ_UNTRUSTED(obj) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't modify instance variable"); if (OBJ_FROZEN(obj)) rb_error_frozen("object"); switch (TYPE(obj)) { @@ -1216,7 +1216,7 @@ rb_obj_remove_instance_variable(VALUE obj, VALUE name) struct st_table *iv_index_tbl; st_data_t index; - if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) + if (!OBJ_UNTRUSTED(obj) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't modify instance variable"); if (OBJ_FROZEN(obj)) rb_error_frozen("object"); if (!rb_is_instance_id(id)) { @@ -1505,7 +1505,7 @@ rb_mod_remove_const(VALUE mod, VALUE name) if (!rb_is_const_id(id)) { rb_name_error(id, "`%s' is not allowed as a constant name", rb_id2name(id)); } - if (!OBJ_TAINTED(mod) && rb_safe_level() >= 4) + if (!OBJ_UNTRUSTED(mod) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't remove constant"); if (OBJ_FROZEN(mod)) rb_error_frozen("class/module"); @@ -1667,7 +1667,7 @@ mod_av_set(VALUE klass, ID id, VALUE val, int isconst) { const char *dest = isconst ? "constant" : "class variable"; - if (!OBJ_TAINTED(klass) && rb_safe_level() >= 4) + if (!OBJ_UNTRUSTED(klass) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't set %s", dest); if (OBJ_FROZEN(klass)) { if (BUILTIN_TYPE(klass) == T_MODULE) { @@ -1922,7 +1922,7 @@ rb_mod_remove_cvar(VALUE mod, VALUE name) if (!rb_is_class_id(id)) { rb_name_error(id, "wrong class variable name %s", rb_id2name(id)); } - if (!OBJ_TAINTED(mod) && rb_safe_level() >= 4) + if (!OBJ_UNTRUSTED(mod) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't remove class variable"); if (OBJ_FROZEN(mod)) rb_error_frozen("class/module"); -- cgit v1.2.3