Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 04:03:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 467210, r=mrbkap, sr=jst, a=blocking1.9+.

Browse Source
This commit is contained in:
Ben Turner 2008-12-28 17:42:30 -05:00
parent afc29208b0
commit db1142e3af
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dom/src/base/nsDOMClassInfo.cpp
View File

@ -5238,18 +5238,22 @@ nsDOMConstructor::Create(const PRUnichar* aName,
nsDOMConstructor** aResult)
{
*aResult = nsnull;
// Prevent creating a constructor if
// - aOwner is inner window which doesn't have outer window or
// - outer window doesn't have inner window or
// - caller can't access outer window's inner window.
// Prevent creating a constructor if aOwner is inner window which doesn't have
// an outer window. If the outer window doesn't have an inner window or the
// caller can't access the outer window's current inner window then try to use
// the owner (so long as it is, in fact, an inner window). If that doesn't
// work then prevent creation also.
nsPIDOMWindow* outerWindow = aOwner->GetOuterWindow();
nsPIDOMWindow* currentInner =
outerWindow ? outerWindow->GetCurrentInnerWindow() : nsnull;
if (!currentInner ||
outerWindow ? outerWindow->GetCurrentInnerWindow() : aOwner;
if (!outerWindow ||
(aOwner != currentInner &&
!nsContentUtils::CanCallerAccess(currentInner))) {
!nsContentUtils::CanCallerAccess(currentInner) &&
!(currentInner = aOwner)->IsInnerWindow())) {
return NS_ERROR_DOM_SECURITY_ERR;
}
NS_ASSERTION(nsContentUtils::CanCallerAccess(currentInner),
"Must be able to access currentInner!");
*aResult = new nsDOMConstructor(aName, aNameStruct, currentInner);
NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY);
NS_ADDREF(*aResult);