Bug 1170207 - allow overrides of chrome://../skin/ URIs with other chrome://../skin/ URIs within skin manifests, r=bsmedberg

2015-06-01 17:05:39 +01:00
parent 6a1cde5594
commit defb618b14
2 changed files with 26 additions and 1 deletions
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -135,7 +135,9 @@ static const ManifestDirective kParsingTable[] = {
    nullptr, &nsChromeRegistry::ManifestStyle, nullptr
  },
  {
-    "override",         2, false, true, true, true, false,
+    // NB: note that while skin manifests can use this, they are only allowed
+    // to use it for chrome://../skin/ URLs
+    "override",         2, false, false, true, true, false,
    nullptr, &nsChromeRegistry::ManifestOverride, nullptr
  },
  {