fix class clone bug

fix freeze/taint bug for cloned/dup'd objects
add test cases


git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@1526 961051c9-f516-0410-bf72-c9f7e237a7b7

src/org/jruby/RubyClass.java

@@ -292,4 +292,8 @@ public RubyClass newSubClass(String name, RubyModule parentModule) {
 
         return newClass;
     }
+
+    protected IRubyObject doClone() {
+    	return RubyClass.newClass(getRuntime(), getSuperClass(), null/*FIXME*/, getBaseName());
+    }
 }

src/org/jruby/RubyHash.java

@@ -308,7 +308,9 @@ public RubyString to_s() {
 
 	public IRubyObject rbClone() {
 		RubyHash result = newHash(getRuntime(), getValueMap(), getDefaultValue());
+		result.setTaint(isTaint());
 		result.initCopy(this);
+		result.setFrozen(isFrozen());
 		return result;
 	}
 

src/org/jruby/RubyModule.java

@@ -977,14 +977,18 @@ public IRubyObject rbClone() {
         }
         return clone;
     }
+
+    protected IRubyObject doClone() {
+    	return RubyModule.newModule(getRuntime(), classId, parentModule);
+    }
 
     /** rb_mod_dup
      *
      */
     public IRubyObject dup() {
         RubyModule dup = (RubyModule) rbClone();
         dup.setMetaClass(getMetaClass());
-
+        dup.setFrozen(false);
         // +++ jpetersen
         // dup.setSingleton(isSingleton());
         // --- jpetersen

src/org/jruby/RubyObject.java

@@ -702,16 +702,20 @@ public RubyClass type_deprecated() {
      *
      */
     public IRubyObject rbClone() {
-        IRubyObject clone = getMetaClass().getRealClass().allocate();
+        IRubyObject clone = doClone();
         clone.setMetaClass(getMetaClass().getSingletonClassClone());
-        clone.setFrozen(false);
+        clone.setTaint(this.isTaint());
         clone.initCopy(this);
-        if (isFrozen()) {
-            clone.setFrozen(true);
-        }
+        clone.setFrozen(isFrozen());
         return clone;
     }
 
+    // Hack: allow RubyModule and RubyClass to override the allocation and return the the correct Java instance
+    // Cloning a class object doesn't work otherwise and I don't really understand why --sma
+    protected IRubyObject doClone() {
+    	return getMetaClass().getRealClass().allocate();
+    }
+
     public IRubyObject display(IRubyObject[] args) {
         IRubyObject port = args.length == 0
             ? getRuntime().getGlobalVariables().get("$>") : args[0];

src/org/jruby/RubyRegexp.java

@@ -451,7 +451,9 @@ public IRubyObject rbClone() {
     	RubyRegexp newObj = new RubyRegexp(getRuntime());
     	newObj.pattern = pattern;
     	newObj.code = code;
-    	initCopy(newObj);
+    	newObj.setTaint(isTaint());
+    	newObj.initCopy(this);
+    	newObj.setFrozen(isFrozen());
         return newObj;
     }
 

src/org/jruby/RubyString.java

@@ -192,9 +192,8 @@ public IRubyObject dup() {
 	 */
 	public IRubyObject rbClone() {
 		IRubyObject newObject = dup();
-
 		newObject.initCopy(this);
-
+		newObject.setFrozen(isFrozen());
 		return newObject;
 	}
 

test/testDupCloneTaintFreeze.rb

@@ -0,0 +1,37 @@
+require 'test/minirunit'
+
+test_check "Test Taint"
+
+test_ok(Module.new.taint.dup.tainted?)
+test_ok(Class.new.taint.dup.tainted?)
+test_ok(Object.new.taint.dup.tainted?)
+test_ok(String.new.taint.dup.tainted?)
+test_ok([].taint.dup.tainted?)
+test_ok({}.taint.dup.tainted?)
+test_ok(//.taint.dup.tainted?)
+
+test_ok(Module.new.taint.clone.tainted?)
+test_ok(Class.new.taint.clone.tainted?)
+test_ok(Object.new.taint.clone.tainted?)
+test_ok(String.new.taint.clone.tainted?)
+test_ok([].taint.clone.tainted?)
+test_ok({}.taint.clone.tainted?)
+test_ok(//.taint.clone.tainted?)
+
+test_check "Test Freeze"
+
+test_ok(!Module.new.freeze.dup.frozen?)
+test_ok(!Class.new.freeze.dup.frozen?)
+test_ok(!Object.new.freeze.dup.frozen?)
+test_ok(!String.new.freeze.dup.frozen?)
+test_ok(![].freeze.dup.frozen?)
+test_ok(!{}.freeze.dup.frozen?)
+test_ok(!//.freeze.dup.frozen?)
+
+test_ok(Module.new.freeze.clone.frozen?)
+test_ok(Class.new.freeze.clone.frozen?)
+test_ok(Object.new.freeze.clone.frozen?)
+test_ok(String.new.freeze.clone.frozen?)
+test_ok([].freeze.clone.frozen?)
+test_ok({}.freeze.clone.frozen?)
+test_ok(//.freeze.clone.frozen?)

test/test_index

@@ -43,6 +43,7 @@ testCase.rb
 testLine.rb
 testJavaProxy.rb
 testRedefine.rb
+testDupCloneTaintFreeze.rb
 
 # MRI Ruby tests (from sample/test.rb in Matz's Ruby Interpreter):