Store property name for marked content with an indirect dict.

The name of the property is now stored in the CPDF_ContentMarkItem,
which will be needed to properly write back these content marks
after a change in the stream.

Bug: pdfium:1118
Change-Id: I1296f488b35ee0684efa33d17400ed22a88383a2
Reviewed-on: https://pdfium-review.googlesource.com/37370
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index ae55390eb2..860f6d6b3b 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -608,18 +608,22 @@ void CPDF_StreamContentParser::Handle_BeginMarkedContent_Dictionary() {
     return;
 
   bool bIndirect = pProperty->IsName();
+  ByteString property_name;
   if (bIndirect) {
-    pProperty = FindResourceObj("Properties", pProperty->GetString());
+    property_name = pProperty->GetString();
+    pProperty = FindResourceObj("Properties", property_name);
     if (!pProperty)
       return;
   }
   if (CPDF_Dictionary* pDict = pProperty->AsDictionary()) {
     std::unique_ptr<CPDF_ContentMark> new_marks =
         m_ContentMarksStack.top()->Clone();
-    if (bIndirect)
-      new_marks->AddMarkWithPropertiesDict(std::move(tag), pDict);
-    else
+    if (bIndirect) {
+      new_marks->AddMarkWithPropertiesDict(std::move(tag), pDict,
+                                           property_name);
+    } else {
       new_marks->AddMarkWithDirectDict(std::move(tag), pDict);
+    }
     m_ContentMarksStack.push(std::move(new_marks));
   }
 }