Check whether the annotation content is empty using CFX_WideString.

CFX_ByteString cannot properly check whether the contents string is empty
because the first two bytes of text strings encoded in Unicode are always ASCII
254 followed by 255. So if we get contents in CFX_ByteString, the length will
always be 2.

Also, roll DEPS for testing/corpus to 608bf04.

Review-Url: https://codereview.chromium.org/2293403003

1 files changed, 4 insertions, 2 deletions

diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp
index 631978175c..31c8542daa 100644
--- a/core/fpdfdoc/cpdf_annotlist.cpp
+++ b/core/fpdfdoc/cpdf_annotlist.cpp
@@ -24,7 +24,9 @@ std::unique_ptr<CPDF_Annot> CreatePopupAnnot(CPDF_Annot* pAnnot,
   if (!pParentDict)
     return std::unique_ptr<CPDF_Annot>();
 
-  CFX_ByteString sContents = pParentDict->GetStringBy("Contents");
+  // TODO(jaepark): We shouldn't strip BOM for some strings and not for others.
+  // See pdfium:593.
+  CFX_WideString sContents = pParentDict->GetUnicodeTextBy("Contents");
   if (sContents.IsEmpty())
     return std::unique_ptr<CPDF_Annot>();
 
@@ -32,7 +34,7 @@ std::unique_ptr<CPDF_Annot> CreatePopupAnnot(CPDF_Annot* pAnnot,
   pAnnotDict->SetAtName("Type", "Annot");
   pAnnotDict->SetAtName("Subtype", "Popup");
   pAnnotDict->SetAtString("T", pParentDict->GetStringBy("T"));
-  pAnnotDict->SetAtString("Contents", sContents);
+  pAnnotDict->SetAtString("Contents", sContents.UTF8Encode());
 
   CFX_FloatRect rect = pParentDict->GetRectBy("Rect");
   rect.Normalize();