Bug 1339566: Acquire kungFuDeathGrip a bit earlier, in some nsDocShell code. r=mccr8

MozReview-Commit-ID: AXTQqwyJPmU
This commit is contained in:
Daniel Holbert
2017-02-15 09:56:38 -08:00
parent 9ee6665728
commit 1dda0d6d1e

View File

@@ -8023,12 +8023,12 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
return NS_ERROR_FAILURE;
}
AutoRestore<bool> creatingDocument(mCreatingDocument);
mCreatingDocument = true;
// mContentViewer->PermitUnload may release |this| docshell.
nsCOMPtr<nsIDocShell> kungFuDeathGrip(this);
AutoRestore<bool> creatingDocument(mCreatingDocument);
mCreatingDocument = true;
if (aPrincipal && !nsContentUtils::IsSystemPrincipal(aPrincipal) &&
mItemType != typeChrome) {
MOZ_ASSERT(ChromeUtils::IsOriginAttributesEqualIgnoringAddonId(