wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-31 11:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1426002. Bail out of document.open if beforeunload tears things down. r=mystor

Browse source
This commit is contained in:
wolfbeast 2018-03-17 14:30:49 +01:00 • committed by Roy Tam
commit 29100ca13a
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dom/html/nsHTMLDocument.cpp
View file

@ -1536,6 +1536,18 @@ nsHTMLDocument::Open(JSContext* cx,
nsCOMPtr<nsIDocument> ret = this; nsCOMPtr<nsIDocument> ret = this;
return ret.forget(); return ret.forget();
} }
// Now double-check that our invariants still hold.
if (!mScriptGlobalObject) {
nsCOMPtr<nsIDocument> ret = this;
return ret.forget();
}
nsPIDOMWindowOuter* outer = GetWindow();
if (!outer || (GetInnerWindow() != outer->GetCurrentInnerWindow())) {
nsCOMPtr<nsIDocument> ret = this;
return ret.forget();
}
} }
nsCOMPtr<nsIWebNavigation> webnav(do_QueryInterface(shell)); nsCOMPtr<nsIWebNavigation> webnav(do_QueryInterface(shell));