From 4913a81f3ba4f9039c82893c4820300b8e43e163 Mon Sep 17 00:00:00 2001
From: Infocatcher <infocatcher.dev.null@gmail.com>
Date: Sat, 24 Aug 2013 17:05:47 +0400
Subject: [PATCH] Private protocol: always mark tab as private, even in case of
 malformed URI (related to #94)

---
 protocolRedirect.html | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/protocolRedirect.html b/protocolRedirect.html
index a48502e..90b7375 100644
--- a/protocolRedirect.html
+++ b/protocolRedirect.html
@@ -4,20 +4,6 @@
 <script>
 try {
 	var spec = location.hash.substr(1);
-	if(!spec)
-		throw new Error("No URI");
-	Components.utils.import("resource://gre/modules/Services.jsm");
-	var uri = Services.io.newURI(spec, null, null); // We accept only valid URIs
-
-	try {
-		var iconURL = uri.scheme + "://" + uri.hostPort + "/favicon.ico";
-		var icon = document.createElement("link");
-		icon.rel = "shortcut icon";
-		icon.href = iconURL;
-		document.documentElement.insertBefore(icon, document.documentElement.firstChild);
-	}
-	catch(e2) {
-	}
 
 	try {
 		var dwu = Components.classes["@mozilla.org/inspector/dom-utils;1"]
@@ -57,7 +43,7 @@
 			try {
 				return gBrowser.mStringBundle.getString(id);
 			}
-			catch(e) {
+			catch(e3) {
 			}
 			return undefined;
 		}
@@ -69,6 +55,22 @@
 		document.title = spec;
 		Components.utils.reportError(e2);
 	}
+
+	if(!spec)
+		throw new Error("No URI");
+	Components.utils.import("resource://gre/modules/Services.jsm");
+	var uri = Services.io.newURI(spec, null, null); // We accept only valid URIs
+
+	try {
+		var iconURL = uri.scheme + "://" + uri.hostPort + "/favicon.ico";
+		var icon = document.createElement("link");
+		icon.rel = "shortcut icon";
+		icon.href = iconURL;
+		document.documentElement.insertBefore(icon, document.documentElement.firstChild);
+	}
+	catch(e2) {
+	}
+
 	location.replace(spec);
 }
 catch(e) {