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

This commit is contained in:
Kris Maglione
2018-08-23 16:01:25 -07:00
parent c2a88738c8
commit fa6cdfaf68

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()) {