Bug 1145870. r=bz, a=lmandel
authorKyle Huey <khuey@kylehuey.com>
Fri, 20 Mar 2015 19:19:28 -0700
changeset 237855 0725e4cfa3c37971b193efeab070d2d90e4c84a9
parent 237844 a58b8b59439685585ae97f13f640bad5c0027b67
child 237856 8358c6c2c417c0c39e3b5820d350f4f367bb0349
push id376
push userryanvm@gmail.com
push dateMon, 23 Mar 2015 19:28:00 +0000
treeherdermozilla-b2g37_v2_2@322ee7b6cf6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, lmandel
bugs1145870
milestone37.0
Bug 1145870. r=bz, a=lmandel
docshell/base/nsDocShell.cpp
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -9403,16 +9403,18 @@ nsDocShell::InternalLoad(nsIURI * aURI,
                          nsISHEntry * aSHEntry,
                          bool aFirstParty,
                          const nsAString &aSrcdoc,
                          nsIDocShell* aSourceDocShell,
                          nsIURI* aBaseURI,
                          nsIDocShell** aDocShell,
                          nsIRequest** aRequest)
 {
+    MOZ_RELEASE_ASSERT(!mBlockNavigation);
+
     nsresult rv = NS_OK;
     mOriginalUriString.Truncate();
 
 #ifdef PR_LOGGING
     if (gDocShellLeakLog && PR_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {
         nsAutoCString spec;
         if (aURI)
             aURI->GetSpec(spec);