summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-11-04 16:00:03 -0700
committerCommit bot <commit-bot@chromium.org>2016-11-04 16:00:03 -0700
commit931d087b991a986cc8bfa72131fe8eda0d987fc4 (patch)
tree53099f287c7c1dc83349aae6d3930a9462767518 /core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
parent1d08c50d1c20798001a1944e8a1fd76d09643ef1 (diff)
downloadpdfium-931d087b991a986cc8bfa72131fe8eda0d987fc4.tar.xz
Pass object to ReplaceIndirectObjectIfHigherGeneration() by unique_ptr.
Review-Url: https://codereview.chromium.org/2477003002
Diffstat (limited to 'core/fpdfapi/parser/cpdf_indirect_object_holder.cpp')
-rw-r--r--core/fpdfapi/parser/cpdf_indirect_object_holder.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
index 720fe18606..b2cb08c08a 100644
--- a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
+++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
@@ -53,18 +53,17 @@ uint32_t CPDF_IndirectObjectHolder::AddIndirectObject(CPDF_Object* pObj) {
bool CPDF_IndirectObjectHolder::ReplaceIndirectObjectIfHigherGeneration(
uint32_t objnum,
- CPDF_Object* pObj) {
+ std::unique_ptr<CPDF_Object> pObj) {
ASSERT(objnum);
if (!pObj)
return false;
CPDF_Object* pOldObj = GetIndirectObject(objnum);
- if (pOldObj && pObj->GetGenNum() <= pOldObj->GetGenNum()) {
- delete pObj;
+ if (pOldObj && pObj->GetGenNum() <= pOldObj->GetGenNum())
return false;
- }
+
pObj->m_ObjNum = objnum;
- m_IndirectObjs[objnum].reset(pObj);
+ m_IndirectObjs[objnum] = std::move(pObj);
m_LastObjNum = std::max(m_LastObjNum, objnum);
return true;
}