Issue #1446 - Only match extension add-on types for target applications.

This resolves #1446

1 files changed, 9 insertions, 6 deletions

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 2f298a9349..d12e1de59f 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -6528,12 +6528,15 @@ AddonInternal.prototype = {
         app = targetApp;
     }
 #ifdef MOZ_PHOENIX_EXTENSIONS
-    //Special case: check for Firefox TargetApps. this has to be done AFTER
-    //the initial check to make sure appinfo.ID is preferred, even if
-    //Firefox is listed before it in the install manifest.
-    for (let targetApp of this.targetApplications) {
-      if (targetApp.id == FIREFOX_ID) //Firefox GUID
-        return targetApp;
+    // Special case: check for Firefox TargetApps. this has to be done AFTER
+    // the initial check to make sure appinfo.ID is preferred, even if
+    // Firefox is listed before it in the install manifest.
+    // Only do this for extensions. Other types should not be allowed.
+    if (this.type == "extension") {
+      for (let targetApp of this.targetApplications) {
+        if (targetApp.id == FIREFOX_ID) //Firefox GUID
+          return targetApp;
+      }
     }
 #endif
     // Return toolkit ID if toolkit.