Bug 793370 - crash in nsWebShellWindow::Initialize, r=smaug+bz, a=akeybl

mozilla · Oct 1, 2012 · 6fdfb64 · 6fdfb64
1 parent adaf08b
commit 6fdfb64
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -210,17 +210,18 @@ nsresult nsWebShellWindow::Initialize(nsIXULWindow* aParent,
   // top-level chrome window case. See bug 789773.
   nsCOMPtr<nsIScriptSecurityManager> ssm =
     do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
-  MOZ_ASSERT(NS_SUCCEEDED(rv) && ssm);
-  nsCOMPtr<nsIPrincipal> principal;
-  ssm->GetSubjectPrincipal(getter_AddRefs(principal));
-  if (!principal) {
-    ssm->GetSystemPrincipal(getter_AddRefs(principal));
+  if (ssm) { // Sometimes this happens really early  See bug 793370.
+    nsCOMPtr<nsIPrincipal> principal;
+    ssm->GetSubjectPrincipal(getter_AddRefs(principal));
+    if (!principal) {
+      ssm->GetSystemPrincipal(getter_AddRefs(principal));
+    }
+    rv = mDocShell->CreateAboutBlankContentViewer(principal);
+    NS_ENSURE_SUCCESS(rv, rv);
+    nsCOMPtr<nsIDocument> doc = do_GetInterface(mDocShell);
+    NS_ENSURE_TRUE(!!doc, NS_ERROR_FAILURE);
+    doc->SetIsInitialDocument(true);
   }
-  rv = mDocShell->CreateAboutBlankContentViewer(principal);
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIDocument> doc = do_GetInterface(mDocShell);
-  NS_ENSURE_TRUE(!!doc, NS_ERROR_FAILURE);
-  doc->SetIsInitialDocument(true);
 
   if (nsnull != aUrl)  {
     nsCString tmpStr;