Bug 509315 - NS_ERROR_MALFORMED_URI on session restore (in nsSessionStore.js)

r+sr=neil a-seamonkey2.0=kairo

suite/common/src/nsSessionStore.js

@@ -1793,6 +1793,9 @@ SessionStoreService.prototype = {
       delete tab.__SS_extdata;
 
     for (var i = 0; i < tabData.entries.length; i++) {
+      //XXXzpao Wallpaper patch for bug 509315
+      if (!tabData.entries[i].url)
+        continue;
       history.addEntry(this._deserializeHistoryEntry(tabData.entries[i], aIdMap), true);
     }
 
@@ -1926,6 +1929,9 @@ SessionStoreService.prototype = {
 
     if (aEntry.children && shEntry instanceof Components.interfaces.nsISHContainer) {
       for (var i = 0; i < aEntry.children.length; i++) {
+        //XXXzpao Wallpaper patch for bug 509315
+        if (!aEntry.children[i].url)
+          continue;
         shEntry.AddChild(this._deserializeHistoryEntry(aEntry.children[i], aIdMap), i);
       }
     }

suite/common/tests/browser/Makefile.in

@@ -46,6 +46,7 @@ include $(topsrcdir)/config/rules.mk
 
 _BROWSER_FILES = browser_bug463504.js \
     browser_bug510890.js \
+    browser_bug509315.js \
     $(NULL)
 
 libs::	$(_BROWSER_FILES)

suite/common/tests/browser/browser_bug509315.js

@@ -0,0 +1,96 @@
+/* ***** 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 Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Paul O’Shannessy <paul@oshannessy.com>
+ *
+ * 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 509315 (Wallpaper) **/
+
+  let ss = Components.classes["@mozilla.org/suite/sessionstore;1"]
+                     .getService(Components.interfaces.nsISessionStore);
+  let ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+                     .getService(Components.interfaces.nsIWindowWatcher);
+
+  waitForExplicitFinish();
+
+  let state = {
+    windows: [{
+      tabs: [{
+        entries: [
+          { url: "http://www.mozilla.org/projects/minefield/", title: "Minefield Start Page" },
+          {}
+        ]
+      }]
+    }]
+  };
+
+  let windowObserver = {
+    observe: function(aSubject, aTopic, aData) {
+      let theWin = aSubject.QueryInterface(Ci.nsIDOMWindow);
+
+      switch(aTopic) {
+        case "domwindowopened":
+          theWin.addEventListener("load", function () {
+            theWin.removeEventListener("load", arguments.callee, false);
+            executeSoon(function() {
+              var gotError = false;
+              try {
+                ss.setWindowState(theWin, JSON.stringify(state), true);
+              } catch (e) {
+                if (/NS_ERROR_MALFORMED_URI/.test(e))
+                  gotError = true;
+              }
+              ok(!gotError, "Didn't get a malformed URI error.");
+              executeSoon(function() {
+                theWin.close();
+              });
+            });
+          }, false);
+          break;
+
+        case "domwindowclosed":
+          ww.unregisterNotification(this);
+          finish();
+          break;
+      }
+    }
+  }
+  ww.registerNotification(windowObserver);
+  ww.openWindow(null,
+                location,
+                "_blank",
+                "chrome,all,dialog=no",
+                null);
+
+}