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 --- class.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'class.c') diff --git a/class.c b/class.c index 91ba3e6361..6f64d07612 100644 --- a/class.c +++ b/class.c @@ -383,7 +383,7 @@ rb_include_module(VALUE klass, VALUE module) int changed = 0; rb_frozen_class_p(klass); - if (!OBJ_TAINTED(klass)) { + if (!OBJ_UNTRUSTED(klass)) { rb_secure(4); } @@ -833,6 +833,12 @@ rb_singleton_class(VALUE obj) else { FL_UNSET(klass, FL_TAINT); } + if (OBJ_UNTRUSTED(obj)) { + OBJ_UNTRUST(klass); + } + else { + FL_UNSET(klass, FL_UNTRUSTED); + } if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass); ALLOW_INTS; -- cgit v1.2.3