43050. r=dougt. null checking and ctor null init'ing

2000-06-29 00:49:13 +00:00
parent c4d4f02490
commit b6eff767a9
1 changed files with 6 additions and 1 deletions
--- a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
+++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
@@ -41,7 +41,11 @@
 //*****************************************************************************

 nsDocShellTreeOwner::nsDocShellTreeOwner() : mWebBrowser(nsnull), 
-   mTreeOwner(nsnull)
+   mTreeOwner(nsnull),
+   mWebBrowserChrome(nsnull),
+   mOwnerProgressListener(nsnull),
+   mOwnerWin(nsnull),
+   mOwnerRequestor(nsnull)
 {
 	NS_INIT_REFCNT();
 }
@@ -204,6 +208,7 @@ NS_IMETHODIMP nsDocShellTreeOwner::GetNewWindow(PRInt32 aChromeFlags,
   *aDocShellTreeItem = nsnull;

   nsCOMPtr<nsIWebBrowser> webBrowser;
+   NS_ENSURE_STATE(mWebBrowserChrome, NS_ERROR_FAILURE);
   mWebBrowserChrome->GetNewBrowser(aChromeFlags, getter_AddRefs(webBrowser));
   NS_ENSURE_TRUE(webBrowser, NS_ERROR_FAILURE);