Bug 1145870. r=bz, a=sledru
authorKyle Huey <khuey@kylehuey.com>
Fri, 20 Mar 2015 19:19:28 -0700
changeset 248265 b615089f60c47226a846e5776812e5fab6b75503
parent 248264 d601e9af55fb2c6b38779061f3886183ae99996e
child 248266 4f87a9688961e1d7a046dd979b45a5dd78d943b1
push id7799
push userryanvm@gmail.com
push dateMon, 23 Mar 2015 13:45:39 +0000
treeherdermozilla-aurora@b615089f60c4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, sledru
bugs1145870
milestone38.0a2
Bug 1145870. r=bz, a=sledru
docshell/base/nsDocShell.cpp
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -9541,16 +9541,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);