Make ownership explicit in CPDF_ContentMarkItem

core/fpdftext/cpdf_textpage.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.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fpdftext/include/cpdf_textpage.h"
 
 #include <algorithm>
 #include <utility>
@@ skipping 800 matching lines @@
   int nContentMark = pTextObj->m_ContentMark.CountItems();
   if (nContentMark < 1)
     return FPDFText_MarkedContent::Pass;
 
   CFX_WideString actText;
   bool bExist = false;
   CPDF_Dictionary* pDict = nullptr;
   int n = 0;
   for (n = 0; n < nContentMark; n++) {
     const CPDF_ContentMarkItem& item = pTextObj->m_ContentMark.GetItem(n);
-    if (item.GetParamType() == CPDF_ContentMarkItem::ParamType::None)
+    pDict = item.GetParam();
+    if (!pDict)
       continue;
-    pDict = item.GetParam();
-    CPDF_String* temp =
-        ToString(pDict ? pDict->GetObjectFor("ActualText") : nullptr);
+    CPDF_String* temp = ToString(pDict->GetObjectFor("ActualText"));

[dsinclair, 2016/09/21 19:34:43]

Can't this still, possibly be null, if we called SetPropertyDict(nullptr)?

[Tom Sepez, 2016/09/21 20:04:44]

Either way, pDict is assigned to nullptr, and we continue at 823.

     if (temp) {
       bExist = true;
       actText = temp->GetUnicodeText();
     }
   }
   if (!bExist)
     return FPDFText_MarkedContent::Pass;
 
   if (m_pPreTextObj && m_pPreTextObj->m_ContentMark &&
       m_pPreTextObj->m_ContentMark.CountItems() == n &&
@@ skipping 34 matching lines @@
 void CPDF_TextPage::ProcessMarkedContent(PDFTEXT_Obj Obj) {
   CPDF_TextObject* pTextObj = Obj.m_pTextObj;
   if (!pTextObj->m_ContentMark)
     return;
 
   int nContentMark = pTextObj->m_ContentMark.CountItems();
   if (nContentMark < 1)
     return;
 
   CFX_WideString actText;
-  CPDF_Dictionary* pDict = nullptr;
   for (int n = 0; n < nContentMark; n++) {
     const CPDF_ContentMarkItem& item = pTextObj->m_ContentMark.GetItem(n);
-    if (item.GetParamType() == CPDF_ContentMarkItem::ParamType::None)
-      continue;
-    pDict = item.GetParam();
+    CPDF_Dictionary* pDict = item.GetParam();
     if (pDict)
       actText = pDict->GetUnicodeTextFor("ActualText");
   }
   FX_STRSIZE nItems = actText.GetLength();
   if (nItems < 1)
     return;
 
   CPDF_Font* pFont = pTextObj->GetFont();
   CFX_Matrix formMatrix = Obj.m_formMatrix;
   CFX_Matrix matrix;
@@ skipping 637 matching lines @@
                                  info.m_OriginY);
   return TRUE;
 }
 
 FX_BOOL CPDF_TextPage::IsRectIntersect(const CFX_FloatRect& rect1,
                                        const CFX_FloatRect& rect2) {
   CFX_FloatRect rect = rect1;
   rect.Intersect(rect2);
   return !rect.IsEmpty();
 }