Bug 1484373: Follow-up: Fix null deref. r=bustage CLOSED TREE

--HG--
extra : rebase_source : c7805928b5f4e84112a2928df36383d5d56866e3
extra : amend_source : c4862f4c0af9590ba6981dbc12a216a70ede54fb
This commit is contained in:
Kris Maglione 2018-08-23 16:01:25 -07:00
parent 1894266228
commit 0bf3a103cc

View File

@ -541,7 +541,10 @@ ExtensionPolicyService::CheckWindow(nsPIDOMWindowOuter* aWindow)
void
ExtensionPolicyService::CheckContentScripts(const DocInfo& aDocInfo, bool aIsPreload)
{
nsCOMPtr<nsPIDOMWindowInner> win = aDocInfo.GetWindow()->GetCurrentInnerWindow();
nsCOMPtr<nsPIDOMWindowInner> win;
if (!aIsPreload) {
win = aDocInfo.GetWindow()->GetCurrentInnerWindow();
}
for (auto iter = mExtensions.Iter(); !iter.Done(); iter.Next()) {
if (!win->IsCurrentInnerWindow()) {