From ee0910a7288a76e494d5b7f53e9844c01b6ec305 Mon Sep 17 00:00:00 2001
From: Tanvi Vyas <tvyas@mozilla.com>
Date: Wed, 6 Feb 2013 18:29:24 -0800
Subject: [PATCH] Bug 836951 - If piwin is null, return NS_OK and skip setting
 the mixed content state. r=bsmith

---
 security/manager/boot/src/nsSecureBrowserUIImpl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
index 53e82a9366e..2cfb60c4281 100644
--- a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
+++ b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
@@ -287,7 +287,8 @@ nsSecureBrowserUIImpl::MapInternalToExternalState(uint32_t* aState, lockIconStat
     *aState |= nsIWebProgressListener::STATE_IDENTITY_EV_TOPLEVEL;
 
   nsCOMPtr<nsPIDOMWindow> piwin = do_QueryReferent(mWindow);
-  MOZ_ASSERT(piwin);
+  if (!piwin)
+    return NS_OK;
 
   nsIDocShell* docShell = piwin->GetDocShell();
   MOZ_ASSERT(docShell);