Avoid setting cyclic prototype in BaseFunction.construct().

hns · hns · commit 9bae436032ec · 2012-06-04T10:59:40.000+02:00
Fixes bug 760973 - Object(Object.prototype) causes an infinite loop
diff --git a/src/org/mozilla/javascript/BaseFunction.java b/src/org/mozilla/javascript/BaseFunction.java
@@ -385,7 +385,10 @@ public Scriptable construct(Context cx, Scriptable scope, Object[] args)
             }
             result = (Scriptable)val;
             if (result.getPrototype() == null) {
-                result.setPrototype(getClassPrototype());
+                Scriptable proto = getClassPrototype();
+                if (result != proto) {
+                    result.setPrototype(proto);
+                }
             }
             if (result.getParentScope() == null) {
                 Scriptable parent = getParentScope();

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,10 @@ public Scriptable construct(Context cx, Scriptable scope, Object[] args)`
`385`	`385`	`}`
`386`	`386`	`result = (Scriptable)val;`
`387`	`387`	`if (result.getPrototype() == null) {`
`388`		`- result.setPrototype(getClassPrototype());`
	`388`	`+ Scriptable proto = getClassPrototype();`
	`389`	`+ if (result != proto) {`
	`390`	`+ result.setPrototype(proto);`
	`391`	`+ }`
`389`	`392`	`}`
`390`	`393`	`if (result.getParentScope() == null) {`
`391`	`394`	`Scriptable parent = getParentScope();`