Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 522430 - Don't hand out unexpected objects. Patch by mrbkap, r=jst sr=sicking, a=dveditz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@258987 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.org
2009-11-13 23:34:35 +00:00
parent 29ce4f07ea
commit 893fb00eb3
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
mozilla/dom/src/base/nsGlobalWindow.cpp
View File

@@ -2939,7 +2939,7 @@ nsGlobalWindow::GetOpener(nsIDOMWindowInternal** aOpener)
*aOpener = nsnull;
nsCOMPtr<nsIDOMWindowInternal> opener = do_QueryReferent(mOpener);
nsCOMPtr<nsPIDOMWindow> opener = do_QueryReferent(mOpener);
if (!opener) {
return NS_OK;
}
@@ -2950,27 +2950,36 @@ nsGlobalWindow::GetOpener(nsIDOMWindowInternal** aOpener)
return NS_OK;
}
nsCOMPtr<nsPIDOMWindow> openerPwin(do_QueryInterface(opener));
if (!openerPwin) {
return NS_OK;
}
// First, ensure that we're not handing back a chrome window.
nsGlobalWindow *win = static_cast<nsGlobalWindow *>(openerPwin.get());
if (win->IsChromeWindow()) {
return NS_OK;
}
// We don't want to reveal the opener if the opener is a mail window,
// because opener can be used to spoof the contents of a message (bug 105050).
// So, we look in the opener's root docshell to see if it's a mail window.
nsCOMPtr<nsPIDOMWindow> openerPwin(do_QueryInterface(opener));
if (openerPwin) {
nsCOMPtr<nsIDocShellTreeItem> docShellAsItem =
do_QueryInterface(openerPwin->GetDocShell());
nsCOMPtr<nsIDocShellTreeItem> docShellAsItem =
do_QueryInterface(openerPwin->GetDocShell());
if (docShellAsItem) {
nsCOMPtr<nsIDocShellTreeItem> openerRootItem;
docShellAsItem->GetRootTreeItem(getter_AddRefs(openerRootItem));
nsCOMPtr<nsIDocShell> openerRootDocShell(do_QueryInterface(openerRootItem));
if (openerRootDocShell) {
PRUint32 appType;
nsresult rv = openerRootDocShell->GetAppType(&appType);
if (NS_SUCCEEDED(rv) && appType != nsIDocShell::APP_TYPE_MAIL) {
*aOpener = opener;
}
if (docShellAsItem) {
nsCOMPtr<nsIDocShellTreeItem> openerRootItem;
docShellAsItem->GetRootTreeItem(getter_AddRefs(openerRootItem));
nsCOMPtr<nsIDocShell> openerRootDocShell(do_QueryInterface(openerRootItem));
if (openerRootDocShell) {
PRUint32 appType;
nsresult rv = openerRootDocShell->GetAppType(&appType);
if (NS_SUCCEEDED(rv) && appType != nsIDocShell::APP_TYPE_MAIL) {
*aOpener = opener;
}
}
}
NS_IF_ADDREF(*aOpener);
return NS_OK;
}