Bug 1155963 Only allow NS_LITERAL_CSTRING to be used on compile-time …

…literals r=froydnj,ehsan
Brli · May 14, 2015 · 7148ad0 · 7148ad0
1 parent 7255560
commit 7148ad0
Show file tree

Hide file tree

Showing 25 changed files with 259 additions and 281 deletions.
diff --git a/accessible/atk/Platform.cpp b/accessible/atk/Platform.cpp
@@ -361,13 +361,12 @@ a11y::ShouldA11yBeEnabled()
 #endif
 
   //check gconf-2 setting
-static const char sGconfAccessibilityKey[] =
-    "/desktop/gnome/interface/accessibility";
+#define GCONF_A11Y_KEY "/desktop/gnome/interface/accessibility"
   nsresult rv = NS_OK;
   nsCOMPtr<nsIGConfService> gconf =
     do_GetService(NS_GCONFSERVICE_CONTRACTID, &rv);
   if (NS_SUCCEEDED(rv) && gconf)
-    gconf->GetBool(NS_LITERAL_CSTRING(sGconfAccessibilityKey), &sShouldEnable);
+    gconf->GetBool(NS_LITERAL_CSTRING(GCONF_A11Y_KEY), &sShouldEnable);
 
   return sShouldEnable;
 }
diff --git a/caps/nsPrincipal.cpp b/caps/nsPrincipal.cpp
@@ -790,7 +790,7 @@ nsPrincipal::IsOnCSSUnprefixingWhitelist()
 
 /************************************************************************************************************************/
 
-static const char EXPANDED_PRINCIPAL_SPEC[] = "[Expanded Principal]";
+#define EXPANDED_PRINCIPAL_SPEC "[Expanded Principal]"
 
 NS_IMPL_CLASSINFO(nsExpandedPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY,
                   NS_EXPANDEDPRINCIPAL_CID)
@@ -1015,8 +1015,7 @@ nsExpandedPrincipal::IsOnCSSUnprefixingWhitelist()
 void
 nsExpandedPrincipal::GetScriptLocation(nsACString& aStr)
 {
-  aStr.Assign(EXPANDED_PRINCIPAL_SPEC);
-  aStr.AppendLiteral(" (");
+  aStr.AssignLiteral(EXPANDED_PRINCIPAL_SPEC " (");
 
   for (size_t i = 0; i < mPrincipals.Length(); ++i) {
     if (i != 0) {

diff --git a/caps/nsSystemPrincipal.cpp b/caps/nsSystemPrincipal.cpp
@@ -51,12 +51,12 @@ nsSystemPrincipal::Release()
   return count;
 }
 
-static const char SYSTEM_PRINCIPAL_SPEC[] = "[System Principal]";
+#define SYSTEM_PRINCIPAL_SPEC "[System Principal]"
 
 void
 nsSystemPrincipal::GetScriptLocation(nsACString &aStr)
 {
-    aStr.Assign(SYSTEM_PRINCIPAL_SPEC);
+    aStr.AssignLiteral(SYSTEM_PRINCIPAL_SPEC);
 }
 
 #ifdef DEBUG

diff --git a/dom/fetch/Fetch.cpp b/dom/fetch/Fetch.cpp
@@ -1527,7 +1527,7 @@ FetchBody<Derived>::ContinueConsumeBody(nsresult aStatus, uint32_t aResultLength
       data.Adopt(reinterpret_cast<char*>(aResult), aResultLength);
       autoFree.Reset();
 
-      NS_NAMED_LITERAL_CSTRING(formDataMimeType, NS_LITERAL_CSTRING("multipart/form-data"));
+      NS_NAMED_LITERAL_CSTRING(formDataMimeType, "multipart/form-data");
 
       // Allow semicolon separated boundary/encoding suffix like multipart/form-data; boundary=
       // but disallow multipart/form-datafoobar.
@@ -1550,7 +1550,7 @@ FetchBody<Derived>::ContinueConsumeBody(nsresult aStatus, uint32_t aResultLength
         MOZ_ASSERT(fd);
         localPromise->MaybeResolve(fd);
       } else {
-        NS_NAMED_LITERAL_CSTRING(urlDataMimeType, NS_LITERAL_CSTRING("application/x-www-form-urlencoded"));
+        NS_NAMED_LITERAL_CSTRING(urlDataMimeType, "application/x-www-form-urlencoded");
         bool isValidUrlEncodedMimeType = StringBeginsWith(mMimeType, urlDataMimeType);
 
         if (isValidUrlEncodedMimeType && mMimeType.Length() > urlDataMimeType.Length()) {