bug 304896: Null check mNavigator when we set it, since it isn't guar…

…anteed to be non-null. r+sr=jst
dothq · Aug 19, 2005 · 0b8f97b · 0b8f97b
1 parent 0d0950b
commit 0b8f97b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp
@@ -948,9 +948,11 @@ nsGlobalWindow::SetNewDocument(nsIDOMDocument* aDocument,
         mInnerWindowHolder = wsh->GetInnerWindowHolder();
         mNavigator = wsh->GetNavigator(); // This assignment addrefs.
 
-        // Update mNavigator's docshell pointer now.
-        mNavigator->SetDocShell(mDocShell);
-        mNavigator->LoadingNewDocument();
+        if (mNavigator) {
+          // Update mNavigator's docshell pointer now.
+          mNavigator->SetDocShell(mDocShell);
+          mNavigator->LoadingNewDocument();
+        }
       } else {
         if (thisChrome) {
           newInnerWindow = new nsGlobalChromeWindow(this);