Bug 836951 - If piwin is null, return NS_OK and skip setting the mixed content state. r=bsmith

This commit is contained in:
Tanvi Vyas 2013-02-06 18:29:24 -08:00
parent 3cc1eb92cd
commit ee0910a728

View File

@ -287,7 +287,8 @@ nsSecureBrowserUIImpl::MapInternalToExternalState(uint32_t* aState, lockIconStat
*aState |= nsIWebProgressListener::STATE_IDENTITY_EV_TOPLEVEL; *aState |= nsIWebProgressListener::STATE_IDENTITY_EV_TOPLEVEL;
nsCOMPtr<nsPIDOMWindow> piwin = do_QueryReferent(mWindow); nsCOMPtr<nsPIDOMWindow> piwin = do_QueryReferent(mWindow);
MOZ_ASSERT(piwin); if (!piwin)
return NS_OK;
nsIDocShell* docShell = piwin->GetDocShell(); nsIDocShell* docShell = piwin->GetDocShell();
MOZ_ASSERT(docShell); MOZ_ASSERT(docShell);