Pass object to ReplaceIndirectObjectIfHigherGeneration() by unique_ptr.

core/fpdfapi/parser/cpdf_data_avail.cpp

 // Copyright 2016 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/fpdfapi/parser/cpdf_data_avail.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 1745 matching lines @@
   FX_FILESIZE szPageStartPos = 0;
   FX_FILESIZE szPageLength = 0;
   uint32_t dwObjNum = 0;
   const bool bPagePosGot = m_pHintTables->GetPagePos(index, &szPageStartPos,
                                                      &szPageLength, &dwObjNum);
   if (!bPagePosGot || !dwObjNum)
     return nullptr;
   // We should say to the document, which object is the page.
   m_pDocument->SetPageObjNum(index, dwObjNum);
   // Page object already can be parsed in document.
-  CPDF_Object* pPageDict = m_pDocument->GetIndirectObject(dwObjNum);
-  if (!pPageDict) {
+  if (!m_pDocument->GetIndirectObject(dwObjNum)) {
     m_syntaxParser.InitParser(m_pFileRead, (uint32_t)szPageStartPos);
-    pPageDict = ParseIndirectObjectAt(0, dwObjNum, m_pDocument);
-    if (pPageDict) {

[Tom Sepez, 2016/11/04 19:25:29]

RIOIHG() does this check for us.

-      m_pDocument->ReplaceIndirectObjectIfHigherGeneration(dwObjNum, pPageDict);
-    }
+    m_pDocument->ReplaceIndirectObjectIfHigherGeneration(
+        dwObjNum, pdfium::WrapUnique<CPDF_Object>(
+                      ParseIndirectObjectAt(0, dwObjNum, m_pDocument)));
   }
   return m_pDocument->GetPage(index);
 }
 
 CPDF_DataAvail::DocFormStatus CPDF_DataAvail::IsFormAvail(
     DownloadHints* pHints) {
   if (!m_pDocument)
     return FormAvailable;
 
   if (!m_bLinearizedFormParamLoad) {
@@ skipping 26 matching lines @@
   return FormAvailable;
 }
 
 CPDF_DataAvail::PageNode::PageNode() : m_type(PDF_PAGENODE_UNKNOWN) {}
 
 CPDF_DataAvail::PageNode::~PageNode() {
   for (int32_t i = 0; i < m_childNode.GetSize(); ++i)
     delete m_childNode[i];
   m_childNode.RemoveAll();
 }