Bug 802469 - Make misuse of NS_LITERAL_{C,}STRING a compile error. r=bsmedberg

xpcom/string/public/nsLiteralString.h

@@ -45,6 +45,35 @@ literal_string( const nsACString::char_type* aPtr, uint32_t aLength )
   }
 #endif
 
+namespace mozilla {
+namespace internal {
+
+// This is the same as sizeof(c) - 1, except it won't compile if c isn't a
+// string literal.  This ensures that NS_LITERAL_CSTRING doesn't compile if you
+// pass it a char* (or something else for that matter).
+template<int n>
+inline uint32_t LiteralStringLength(const char (&c)[n])
+{
+  return n - 1;
+}
+
+#if defined(HAVE_CPP_CHAR16_T)
+template<int n>
+inline uint32_t LiteralWStringLength(const char16_t (&c)[n])
+{
+  return n - 1;
+}
+#elif defined(HAVE_CPP_2BYTE_WCHAR_T)
+template<int n>
+inline uint32_t LiteralWStringLength(const wchar_t (&c)[n])
+{
+  return n - 1;
+}
+#endif
+
+} // namespace internal
+} // namespace mozilla
+
 #if defined(HAVE_CPP_CHAR16_T) || defined(HAVE_CPP_2BYTE_WCHAR_T)
 #if defined(HAVE_CPP_CHAR16_T)
   //PR_STATIC_ASSERT(sizeof(char16_t) == 2);
@@ -53,15 +82,15 @@ literal_string( const nsACString::char_type* aPtr, uint32_t aLength )
   //PR_STATIC_ASSERT(sizeof(wchar_t) == 2);
   #define NS_LL(s)                                L##s
 #endif
-  #define NS_MULTILINE_LITERAL_STRING(s)          nsDependentString(reinterpret_cast<const nsAString::char_type*>(s), uint32_t((sizeof(s)/2)-1))
-  #define NS_MULTILINE_LITERAL_STRING_INIT(n,s)   n(reinterpret_cast<const nsAString::char_type*>(s), uint32_t((sizeof(s)/2)-1))
-  #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s)  const nsDependentString n(reinterpret_cast<const nsAString::char_type*>(s), uint32_t((sizeof(s)/2)-1))
+  #define NS_MULTILINE_LITERAL_STRING(s)          nsDependentString(reinterpret_cast<const nsAString::char_type*>(s), mozilla::internal::LiteralWStringLength(s))
+  #define NS_MULTILINE_LITERAL_STRING_INIT(n,s)   n(reinterpret_cast<const nsAString::char_type*>(s), mozilla::internal::LiteralWStringLength(s))
+  #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s)  const nsDependentString n(reinterpret_cast<const nsAString::char_type*>(s), mozilla::internal::LiteralWStringLength(s))
   typedef nsDependentString nsLiteralString;
 #else
   #define NS_LL(s)                                s
-  #define NS_MULTILINE_LITERAL_STRING(s)          NS_ConvertASCIItoUTF16(s, uint32_t(sizeof(s)-1))
-  #define NS_MULTILINE_LITERAL_STRING_INIT(n,s)   n(s, uint32_t(sizeof(s)-1))
-  #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s)  const NS_ConvertASCIItoUTF16 n(s, uint32_t(sizeof(s)-1))
+  #define NS_MULTILINE_LITERAL_STRING(s)          NS_ConvertASCIItoUTF16(s, mozilla::internal::LiteralStringLength(s))
+  #define NS_MULTILINE_LITERAL_STRING_INIT(n,s)   n(s, mozilla::internal::LiteralStringLength(s))
+  #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s)  const NS_ConvertASCIItoUTF16 n(s, mozilla::internal::LiteralStringLength(s))
   typedef NS_ConvertASCIItoUTF16 nsLiteralString;
 #endif
 
@@ -80,9 +109,9 @@ literal_string( const nsACString::char_type* aPtr, uint32_t aLength )
 #define NS_LITERAL_STRING_INIT(n,s)               NS_MULTILINE_LITERAL_STRING_INIT(n, NS_LL(s))
 #define NS_NAMED_LITERAL_STRING(n,s)              NS_NAMED_MULTILINE_LITERAL_STRING(n, NS_LL(s))
 
-#define NS_LITERAL_CSTRING(s)                     static_cast<const nsDependentCString&>(nsDependentCString(s, uint32_t(sizeof(s)-1)))
-#define NS_LITERAL_CSTRING_INIT(n,s)              n(s, uint32_t(sizeof(s)-1))
-#define NS_NAMED_LITERAL_CSTRING(n,s)             const nsDependentCString n(s, uint32_t(sizeof(s)-1))
+#define NS_LITERAL_CSTRING(s)                     static_cast<const nsDependentCString&>(nsDependentCString(s, mozilla::internal::LiteralStringLength(s)))
+#define NS_LITERAL_CSTRING_INIT(n,s)              n(s, mozilla::internal::LiteralStringLength(s))
+#define NS_NAMED_LITERAL_CSTRING(n,s)             const nsDependentCString n(s, mozilla::internal::LiteralStringLength(s))
 
 typedef nsDependentCString nsLiteralCString;