Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: core/fpdfapi/parser/cpdf_indirect_object_holder.cpp

Issue 2479303002: Use unique_ptr return from CPDF_Parser::ParseIndirectObject() (Closed)
Patch Set: Work around android Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
index b2cb08c08a85290ed78a7ab2485a706756868f74..529eda21fb156424d73a5e3759a971aecd058092 100644
--- a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
+++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
@@ -28,17 +28,18 @@ CPDF_Object* CPDF_IndirectObjectHolder::GetOrParseIndirectObject(
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;
}

Powered by Google App Engine
This is Rietveld 408576698