Use unique_ptr return from CPDF_Parser::ParseIndirectObject()

core/fpdfapi/parser/cpdf_indirect_object_holder.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_indirect_object_holder.h"
 
 #include "core/fpdfapi/parser/cpdf_object.h"
 #include "core/fpdfapi/parser/cpdf_parser.h"
@@ skipping 10 matching lines @@
 
 CPDF_Object* CPDF_IndirectObjectHolder::GetOrParseIndirectObject(
     uint32_t objnum) {
   if (objnum == 0)
     return nullptr;
 
   CPDF_Object* pObj = GetIndirectObject(objnum);
   if (pObj)
     return pObj->GetObjNum() != CPDF_Object::kInvalidObjNum ? pObj : nullptr;
 
-  pObj = ParseIndirectObject(objnum);
-  if (!pObj)
+  std::unique_ptr<CPDF_Object> pNewObj = ParseIndirectObject(objnum);
+  if (!pNewObj)
     return nullptr;
 
-  pObj->m_ObjNum = objnum;
+  pNewObj->m_ObjNum = objnum;
   m_LastObjNum = std::max(m_LastObjNum, objnum);
-  m_IndirectObjs[objnum].reset(pObj);
-  return pObj;
+  m_IndirectObjs[objnum] = std::move(pNewObj);
+  return m_IndirectObjs[objnum].get();
 }
 
-CPDF_Object* CPDF_IndirectObjectHolder::ParseIndirectObject(uint32_t objnum) {
+std::unique_ptr<CPDF_Object> CPDF_IndirectObjectHolder::ParseIndirectObject(
+    uint32_t objnum) {
   return nullptr;
 }
 
 uint32_t CPDF_IndirectObjectHolder::AddIndirectObject(CPDF_Object* pObj) {
   CHECK(!pObj->m_ObjNum);
   m_LastObjNum++;
   m_IndirectObjs[m_LastObjNum].release();  // TODO(tsepez): stop this leak.
   m_IndirectObjs[m_LastObjNum].reset(pObj);
   pObj->m_ObjNum = m_LastObjNum;
   return m_LastObjNum;
@@ skipping 16 matching lines @@
   return true;
 }
 
 void CPDF_IndirectObjectHolder::DeleteIndirectObject(uint32_t objnum) {
   CPDF_Object* pObj = GetIndirectObject(objnum);
   if (!pObj || pObj->GetObjNum() == CPDF_Object::kInvalidObjNum)
     return;
 
   m_IndirectObjs.erase(objnum);
 }