mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
Fix for bug 123032. Check for null pointers before using them. R=rdayal, SR=bienvenu
This commit is contained in:
parent
b285e8ccaa
commit
15420ff7b1
@ -294,15 +294,21 @@ void nsMsgComposeService::CloseWindow(nsIDOMWindowInternal *domWindow)
|
||||
if (globalObj)
|
||||
{
|
||||
globalObj->GetDocShell(getter_AddRefs(docshell));
|
||||
nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(docshell));
|
||||
nsCOMPtr<nsIDocShellTreeOwner> treeOwner;
|
||||
treeItem->GetTreeOwner(getter_AddRefs(treeOwner));
|
||||
if (treeItem)
|
||||
if (docshell)
|
||||
{
|
||||
nsCOMPtr<nsIBaseWindow> baseWindow;
|
||||
baseWindow = do_QueryInterface(treeOwner);
|
||||
if (baseWindow)
|
||||
baseWindow->Destroy();
|
||||
nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(docshell));
|
||||
if (treeItem)
|
||||
{
|
||||
nsCOMPtr<nsIDocShellTreeOwner> treeOwner;
|
||||
treeItem->GetTreeOwner(getter_AddRefs(treeOwner));
|
||||
if (treeOwner)
|
||||
{
|
||||
nsCOMPtr<nsIBaseWindow> baseWindow;
|
||||
baseWindow = do_QueryInterface(treeOwner);
|
||||
if (baseWindow)
|
||||
baseWindow->Destroy();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user