Fix unittest with embedded NUL character.

fpdfsdk/fpdfedit_embeddertest.cpp

Index: fpdfsdk/fpdfedit_embeddertest.cpp
diff --git a/fpdfsdk/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdfedit_embeddertest.cpp
index 480ef51dbd044417eeb7c6133844a886834f8732..dc822ddb3823f441ea301f440c8ba22847a07893 100644
--- a/fpdfsdk/fpdfedit_embeddertest.cpp
+++ b/fpdfsdk/fpdfedit_embeddertest.cpp
@@ -11,50 +11,60 @@
 
 class FPDFEditEmbeddertest : public EmbedderTest, public TestSaver {};
 
+namespace {
+const char kExpectedPDF[] =
+    "%PDF-1.7\r\n"
+    "%\xA1\xB3\xC5\xD7\r\n"
+    "1 0 obj\r\n"
+    "<</Pages 2 0 R /Type/Catalog>>\r\n"
+    "endobj\r\n"
+    "2 0 obj\r\n"
+    "<</Count 1/Kids\\[ 4 0 R \\]/Type/Pages>>\r\n"
+    "endobj\r\n"
+    "3 0 obj\r\n"
+    "<</CreationDate\\(D:.*\\)/Creator\\(PDFium\\)>>\r\n"
+    "endobj\r\n"
+    "4 0 obj\r\n"
+    "<</Contents 5 0 R /MediaBox\\[ 0 0 640 480\\]"
+    "/Parent 2 0 R /Resources<<>>/Rotate 0/Type/Page"
+    ">>\r\n"
+    "endobj\r\n"
+    "5 0 obj\r\n"
+    "<</Filter/FlateDecode/Length 8>>stream\r\n"
+    // Character '_' is matching '\0' (see comment below).
+    "x\x9C\x3____\x1\r\n"
+    "endstream\r\n"
+    "endobj\r\n"
+    "xref\r\n"
+    "0 6\r\n"
+    "0000000000 65535 f\r\n"
+    "0000000017 00000 n\r\n"
+    "0000000066 00000 n\r\n"
+    "0000000122 00000 n\r\n"
+    "0000000192 00000 n\r\n"
+    "0000000301 00000 n\r\n"
+    "trailer\r\n"
+    "<<\r\n"
+    "/Root 1 0 R\r\n"
+    "/Info 3 0 R\r\n"
+    "/Size 6/ID\\[<.*><.*>\\]>>\r\n"
+    "startxref\r\n"
+    "379\r\n"
+    "%%EOF\r\n";
+}  // namespace
+
 TEST_F(FPDFEditEmbeddertest, EmptyCreation) {
   EXPECT_TRUE(CreateEmptyDocument());
   FPDF_PAGE page = FPDFPage_New(document(), 1, 640.0, 480.0);
   EXPECT_NE(nullptr, page);
   EXPECT_TRUE(FPDFPage_GenerateContent(page));
   EXPECT_TRUE(FPDF_SaveAsCopy(document(), this, 0));
-  EXPECT_THAT(GetString(),
-              testing::MatchesRegex(
-                  "%PDF-1.7\r\n"
-                  "%\xA1\xB3\xC5\xD7\r\n"
-                  "1 0 obj\r\n"
-                  "<</Pages 2 0 R /Type/Catalog>>\r\n"
-                  "endobj\r\n"
-                  "2 0 obj\r\n"
-                  "<</Count 1/Kids\\[ 4 0 R \\]/Type/Pages>>\r\n"
-                  "endobj\r\n"
-                  "3 0 obj\r\n"
-                  "<</CreationDate\\(D:.*\\)/Creator\\(PDFium\\)>>\r\n"
-                  "endobj\r\n"
-                  "4 0 obj\r\n"
-                  "<</Contents 5 0 R /MediaBox\\[ 0 0 640 480\\]"
-                  "/Parent 2 0 R /Resources<<>>/Rotate 0/Type/Page"
-                  ">>\r\n"
-                  "endobj\r\n"
-                  "5 0 obj\r\n"
-                  "<</Filter/FlateDecode/Length 8>>stream\r\n"
-                  "x\x9C\x3\0\0\0\0\x1\r\n"
-                  "endstream\r\n"
-                  "endobj\r\n"
-                  "xref\r\n"
-                  "0 6\r\n"
-                  "0000000000 65535 f\r\n"
-                  "0000000017 00000 n\r\n"
-                  "0000000066 00000 n\r\n"
-                  "0000000122 00000 n\r\n"
-                  "0000000192 00000 n\r\n"
-                  "0000000301 00000 n\r\n"
-                  "trailer\r\n"
-                  "<<\r\n"
-                  "/Root 1 0 R\r\n"
-                  "/Info 3 0 R\r\n"
-                  "/Size 6/ID\\[<.*><.*>\\]>>\r\n"
-                  "startxref\r\n"
-                  "379\r\n"
-                  "%%EOF\r\n"));
+
+  // The MatchesRegexp doesn't support embedded NUL ('\0') characters. They are
+  // replaced by '_' for the purpose of the test.
+  std::string result = GetString();
+  std::replace(result.begin(), result.end(), '\0', 'x');
+  EXPECT_THAT(result, testing::MatchesRegex(

[Tom Sepez, 2016/04/25 22:31:42]

Ooops.  Need to make this match the above.

[etienneb, 2016/04/26 15:02:33]

my bad! fixed.

+                          std::string(kExpectedPDF, sizeof(kExpectedPDF))));
   FPDFPage_Delete(document(), 1);
 }