Bug 485482 - Session Restore should handle invalid XPaths better. r=dietrich

browser/components/sessionstore/src/nsSessionStore.js

@@ -2692,7 +2692,7 @@ let XPathHelper = {
       return "";
     
     let prefix = this.namespacePrefixes[aNode.namespaceURI] || null;
-    let tag = (prefix ? prefix + ":" : "") + aNode.localName;
+    let tag = (prefix ? prefix + ":" : "") + this.escapeName(aNode.localName);
     
     // stop once we've found a tag with an ID
     if (aNode.id)
@@ -2728,6 +2728,16 @@ let XPathHelper = {
     return XPathHelper.namespaceURIs[aPrefix] || null;
   },
 
+  /**
+   * @returns valid XPath for the given node (usually just the local name itself)
+   */
+  escapeName: function sss_xph_escapeName(aName) {
+    // we can't just use the node's local name, if it contains
+    // special characters (cf. bug 485482)
+    return /^\w+$/.test(aName) ? aName :
+           "*[local-name()=" + this.quoteArgument(aName) + "]";
+  },
+
   /**
    * @returns a properly quoted string to insert into an XPath query
    */

browser/components/sessionstore/test/browser/Makefile.in

@@ -81,6 +81,8 @@ _BROWSER_TEST_FILES = \
 	browser_476161_sample.html \
 	browser_480893.js \
 	browser_483330.js \
+	browser_485482.js \
+	browser_485482_sample.html \
 	browser_485563.js \
 	$(NULL)
 

browser/components/sessionstore/test/browser/browser_485482.js

@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is sessionstore test code.
+ *
+ * The Initial Developer of the Original Code is
+ * Simon Bünzli <zeniko@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+function test() {
+  /** Test for Bug 485482 **/
+  
+  waitForExplicitFinish();
+  
+  let uniqueValue = Math.random();
+  
+  let testURL = "chrome://mochikit/content/browser/" +
+    "browser/components/sessionstore/test/browser/browser_485482_sample.html";
+  let tab = gBrowser.addTab(testURL);
+  tab.linkedBrowser.addEventListener("load", function(aEvent) {
+    let doc = tab.linkedBrowser.contentDocument;
+    doc.querySelector("input[type=text]").value = uniqueValue;
+    doc.querySelector("input[type=checkbox]").checked = true;
+    
+    let tab2 = gBrowser.duplicateTab(tab);
+    tab2.linkedBrowser.addEventListener("load", function(aEvent) {
+      doc = tab2.linkedBrowser.contentDocument;
+      is(doc.querySelector("input[type=text]").value, uniqueValue,
+         "generated XPath expression was valid");
+      ok(doc.querySelector("input[type=checkbox]").checked,
+         "generated XPath expression was valid");
+      
+      // clean up
+      gBrowser.removeTab(tab2);
+      gBrowser.removeTab(tab);
+      finish();
+    }, true);
+  }, true);
+}

browser/components/sessionstore/test/browser/browser_485482_sample.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>Test for bug 485482</title>
+
+<bad=name>
+  <input type="text">
+</bad=name>
+
+<worse=name>
+  <l0c@l+na~e"'§>
+    <input type="checkbox" name="check"> Check
+  </l0c@l+na~e"'§>
+</worse=name>