diff -r 000000000000 -r 6474c204b198 docshell/test/browser/browser_bug670318.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docshell/test/browser/browser_bug670318.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,60 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test for Bug 670318
+ *
+ * When LoadEntry() is called on a browser that has multiple duplicate history
+ * entries, history.index can end up out of range (>= history.count).
+ */
+
+const URL = "http://mochi.test:8888/browser/docshell/test/browser/file_bug670318.html";
+
+function test() {
+  waitForExplicitFinish();
+
+  let count = 0, historyListenerRemoved = false;
+
+  let listener = {
+    OnHistoryNewEntry: function (aNewURI) {
+      if (aNewURI.spec == URL && 5 == ++count) {
+        browser.addEventListener("load", function onLoad() {
+          browser.removeEventListener("load", onLoad, true);
+
+          ok(history.index < history.count, "history.index is valid");
+          finish();
+        }, true);
+
+        history.removeSHistoryListener(listener);
+        historyListenerRemoved = true;
+
+        executeSoon(function () BrowserReload());
+      }
+
+      return true;
+    },
+
+    OnHistoryReload: function () true,
+    OnHistoryGoBack: function () true,
+    OnHistoryGoForward: function () true,
+    OnHistoryGotoIndex: function () true,
+    OnHistoryPurge: function () true,
+    OnHistoryReplaceEntry: function () true,
+
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsISHistoryListener,
+                                           Ci.nsISupportsWeakReference])
+  };
+
+  let tab = gBrowser.loadOneTab(URL, {inBackground: false});
+  let browser = tab.linkedBrowser;
+  let history = browser.sessionHistory;
+
+  history.addSHistoryListener(listener);
+
+  registerCleanupFunction(function () {
+    gBrowser.removeTab(tab);
+
+    if (!historyListenerRemoved)
+      history.removeSHistoryListener(listener);
+  });
+}