Bug 1370263: Null check document URI before matching content scripts. r?mixedpuppy draft
authorKris Maglione <maglione.k@gmail.com>
Mon, 05 Jun 2017 10:26:06 -0700
changeset 589153 120c46a987dd52d00693888a1654390a46f82e0f
parent 588965 0534d36df322f8d1b806cef0705733cdf3f7b89f
child 631774 d3e4921b74d0a2a3776c9d8f514c912fa16bcf5f
push id62257
push usermaglione.k@gmail.com
push dateMon, 05 Jun 2017 17:26:18 +0000
reviewersmixedpuppy
bugs1370263
milestone55.0a1
Bug 1370263: Null check document URI before matching content scripts. r?mixedpuppy MozReview-Commit-ID: IB8HMmukD1h
toolkit/components/extensions/ExtensionPolicyService.cpp
--- a/toolkit/components/extensions/ExtensionPolicyService.cpp
+++ b/toolkit/components/extensions/ExtensionPolicyService.cpp
@@ -239,17 +239,19 @@ ExtensionPolicyService::CheckRequest(nsI
 // Checks a document, just after the document element has been inserted, for
 // matching content scripts or extension principals, and loads them if
 // necessary.
 void
 ExtensionPolicyService::CheckDocument(nsIDocument* aDocument)
 {
   nsCOMPtr<nsPIDOMWindowOuter> win = aDocument->GetWindow();
   if (win) {
-    CheckContentScripts(win.get(), false);
+    if (win->GetDocumentURI()) {
+      CheckContentScripts(win.get(), false);
+    }
 
     nsIPrincipal* principal = aDocument->NodePrincipal();
 
     nsAutoString addonId;
     Unused << principal->GetAddonId(addonId);
 
     RefPtr<WebExtensionPolicy> policy = GetByID(addonId);
     if (policy) {