www

commit 067e5ce5b49ab5d19def7cf7a3c306547f716678
parent dfd0a7ad83abe38c3103b8464226426cc5e571c8
Author: Simon Kornblith <simon@simonster.com>
Date:   Sat,  3 Nov 2012 18:33:33 -0400

Another attempt at fixing Firefox 17 sandboxing issues

Diffstat:
M
chrome/content/zotero/xpcom/translation/translate_firefox.js
 | 
43
++++++++++++++++++++++++++++++++++++-------

1 file changed, 36 insertions(+), 7 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translation/translate_firefox.js b/chrome/content/zotero/xpcom/translation/translate_firefox.js
@@ -116,6 +116,7 @@ Zotero.Translate.SandboxManager.Fx5DOMWrapper = function(obj, parent) {
 	val.__wrappedDOMObject = obj;
 	val.__exposedProps__ = {};
 	for(var prop in obj) {
+		if(prop === "prototype") continue;
 		let localProp = prop,
 			cachedWrapper;
 		val.__exposedProps__[localProp] = "r";
@@ -150,7 +151,8 @@ Zotero.Translate.SandboxManager.prototype = {
 	"importObject":function(object, passAsFirstArgument, attachTo) {
 		if(!attachTo) attachTo = this.sandbox.Zotero;
 		var newExposedProps = false,
-			sandbox = this.sandbox;
+			sandbox = this.sandbox,
+			me = this;
 		if(!object.__exposedProps__) newExposedProps = {};
 		for(var key in (newExposedProps ? object : object.__exposedProps__)) {
 			let localKey = key;
@@ -164,12 +166,7 @@ Zotero.Translate.SandboxManager.prototype = {
 					attachTo[localKey] = function() {
 						var args = Array.prototype.slice.apply(arguments);
 						if(passAsFirstArgument) args.unshift(passAsFirstArgument);
-						var out = object[localKey].apply(object, args);
-						if(out instanceof Array) {
-							// Copy to sandbox
-							out = sandbox.Array.prototype.slice.apply(out);
-						}
-						return out;
+						return me._copyObject(object[localKey].apply(object, args));
 					};
 				} else {
 					attachTo[localKey] = {};
@@ -189,6 +186,38 @@ Zotero.Translate.SandboxManager.prototype = {
 		} else {
 			attachTo.__exposedProps__ = object.__exposedProps__;
 		}
+	},
+	
+	/**
+	 * Copies a JavaScript object to this sandbox
+	 * @param {Object} obj
+	 * @return {Object}
+	 */
+	"_copyObject":function(obj, wm) {
+		if(typeof obj !== "object" || obj === null
+				|| (obj.__proto__ !== Object.prototype && obj.__proto__ !== Array.prototype)
+				|| "__exposedProps__" in obj || "__wrappedDOMObject" in obj) {
+			return obj;
+		}
+		if(!wm) wm = new WeakMap();
+		var obj2 = (obj instanceof Array ? this.sandbox.Array() : this.sandbox.Object());
+		for(var i in obj) {
+			if(!obj.hasOwnProperty(i)) continue;
+			
+			var prop1 = obj[i];
+			if(typeof prop1 === "object" && prop1 !== null
+					&& (prop1.__proto__ === Object.prototype || prop1.__proto__ === Array.prototype)) {
+				var prop2 = wm.get(prop1);
+				if(prop2 === undefined) {
+					prop2 = this._copyObject(prop1, wm);
+					wm.set(prop1, prop2);
+				}
+				obj2[i] = prop2;
+			} else {
+				obj2[i] = prop1;
+			}
+		}
+		return obj2;
 	}
 }