Make constructors recognize char[n] vs. char* and avoid strlen calls.

core/src/fxcrt/fx_basic_bstring_unittest.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "../../../testing/fx_string_testhelpers.h"
 #include "../../include/fxcrt/fx_basic.h"
 
+TEST(fxcrt, ByteStringNotNull) {
+  CFX_ByteString string3("abc");
+  CFX_ByteString string6("abcdef");
+  CFX_ByteString alternate_string3("abcdef", 3);
+  CFX_ByteStringC illegal_string7("abcdef", 7);
+  EXPECT_EQ(3, string3.GetLength());
+  EXPECT_EQ(6, string6.GetLength());
+  EXPECT_EQ(3, alternate_string3.GetLength());
+  EXPECT_EQ(7, illegal_string7.GetLength());
+
+  // Prove constructor uses sizeof(), not strlen() against literals.
+  CFX_ByteString literal_string("abc\0def");
+  EXPECT_EQ(7, literal_string.GetLength());
+
+  // Prove constructor uses strlen(), not sizeof() against mutable arrays.
+  char array[32];
+  memcpy(array, "abc\0def", 7);
+  CFX_ByteString array_string(array);
+  EXPECT_EQ(3, array_string.GetLength());
+
+  // Prove constructor uses strlen(), not sizeof() against pointers.
+  const char* ptr = "abc\0def";
+  CFX_ByteString pointer_string(ptr);
+  EXPECT_EQ(3, pointer_string.GetLength());
+}
+
 TEST(fxcrt, ByteStringOperatorSubscript) {
     // CFX_ByteString includes the NUL terminator for non-empty strings.
     CFX_ByteString abc("abc");
     EXPECT_EQ('a', abc[0]);
     EXPECT_EQ('b', abc[1]);
     EXPECT_EQ('c', abc[2]);
     EXPECT_EQ(0, abc[3]);
 }
 
 TEST(fxcrt, ByteStringOperatorLT) {
@@ skipping 166 matching lines @@
   CFX_ByteStringC non_null_string("a");
   EXPECT_NE(null_string, non_null_string);
 }
 
 TEST(fxcrt, ByteStringCNotNull) {
   CFX_ByteStringC string3("abc");
   CFX_ByteStringC string6("abcdef");
   CFX_ByteStringC alternate_string3("abcdef", 3);
   CFX_ByteStringC embedded_nul_string7("abc\0def", 7);
   CFX_ByteStringC illegal_string7("abcdef", 7);
-
   EXPECT_EQ(3, string3.GetLength());
   EXPECT_EQ(6, string6.GetLength());
   EXPECT_EQ(3, alternate_string3.GetLength());
   EXPECT_EQ(7, embedded_nul_string7.GetLength());
   EXPECT_EQ(7, illegal_string7.GetLength());
 
+  // Prove constructor uses sizeof(), not strlen() against literals.
+  CFX_ByteStringC literal_string("abc\0def");
+  EXPECT_EQ(7, literal_string.GetLength());
+
+  // Prove constructor uses strlen(), not sizeof() against mutable arrays.
+  char array[32];
+  memcpy(array, "abc\0def", 7);
+  CFX_ByteStringC array_string(array);
+  EXPECT_EQ(3, array_string.GetLength());
+
+  // Prove constructor uses strlen(), not sizeof() against pointers.
+  const char* ptr = "abc\0def";
+  CFX_ByteStringC pointer_string(ptr);
+  EXPECT_EQ(3, pointer_string.GetLength());
+
   EXPECT_NE(string3, string6);
   EXPECT_EQ(string3, alternate_string3);
   EXPECT_NE(string3, embedded_nul_string7);
   EXPECT_NE(string3, illegal_string7);
   EXPECT_NE(string6, alternate_string3);
   EXPECT_NE(string6, embedded_nul_string7);
   EXPECT_NE(string6, illegal_string7);
   EXPECT_NE(alternate_string3, embedded_nul_string7);
   EXPECT_NE(alternate_string3, illegal_string7);
   EXPECT_NE(embedded_nul_string7, illegal_string7);
@@ skipping 255 matching lines @@
     const char* c_string2 = "hellp";
     const char* c_string3 = "hellod";
     ASSERT_TRUE(byte_string_c != c_string1);
     ASSERT_TRUE(byte_string_c != c_string2);
     ASSERT_TRUE(byte_string_c != c_string3);
 
     ASSERT_TRUE(c_string1 != byte_string_c);
     ASSERT_TRUE(c_string2 != byte_string_c);
     ASSERT_TRUE(c_string3 != byte_string_c);
 }