Safe way to handle source window with Element Properties extension

(related to #20)
Infocatcher · May 24, 2016 · 410aca5 · 410aca5
1 parent 5d616bf
commit 410aca5
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/chrome/content/linkPropsPlus.js b/chrome/content/linkPropsPlus.js
@@ -1196,8 +1196,15 @@ var linkPropsPlusSvc = {
 		return this._uri = dialog.mLauncher.source.spec;
 	},
 	get realReferer() {
-		if(this.isPropsDialog)
-			return window.arguments[0].ownerDocument.documentURI;
+		if(this.isPropsDialog) {
+			try { // e10s + unsafe CPOW usage?
+				return window.arguments[0].ownerDocument.documentURI;
+			}
+			catch(e) {
+				Components.utils.reportError(e);
+			}
+			return this._uri;
+		}
 		if(this.isOwnWindow)
 			return this.wnd.referer;
 		var err;
@@ -1264,8 +1271,15 @@ var linkPropsPlusSvc = {
 		return this.ensureWindowOpened(this._sourceWindow);
 	},
 	get _sourceWindow() {
-		if(this.isPropsDialog)
-			return window.arguments[0].ownerDocument.defaultView;
+		if(this.isPropsDialog) {
+			try { // e10s + unsafe CPOW usage?
+				return window.arguments[0].ownerDocument.defaultView;
+			}
+			catch(e) {
+				Components.utils.reportError(e);
+			}
+			return null;
+		}
 		if(this.isOwnWindow)
 			return this.wnd.sourceWindow;