diff options
author | tsepez <tsepez@chromium.org> | 2016-10-14 16:59:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-10-14 16:59:10 -0700 |
commit | 3ba098595ae56b64eacc0c25ab76b89a4d78d920 (patch) | |
tree | 5c4db47295ea64cdf236c32ef7d5af5b8e7af232 /core/fpdfapi/parser/cpdf_indirect_object_holder.cpp | |
parent | 1d023881cd53485303c0fcc0b5878e700dc470fd (diff) | |
download | pdfium-3ba098595ae56b64eacc0c25ab76b89a4d78d920.tar.xz |
Update CPDF_IndirectObjectHolder APIs for unique objects.
Doing so highlights a few places where ownership is dubious.
Add convenience functions to return an unowned reference to
a newly-created indirect object.
Review-Url: https://codereview.chromium.org/2419173002
Diffstat (limited to 'core/fpdfapi/parser/cpdf_indirect_object_holder.cpp')
-rw-r--r-- | core/fpdfapi/parser/cpdf_indirect_object_holder.cpp | 51 |
1 files changed, 39 insertions, 12 deletions
diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp index 6e549de5a7..49567e50a1 100644 --- a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp +++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp @@ -6,8 +6,11 @@ #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" +#include "core/fpdfapi/parser/cpdf_array.h" +#include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fpdfapi/parser/cpdf_parser.h" +#include "core/fpdfapi/parser/cpdf_stream.h" CPDF_IndirectObjectHolder::CPDF_IndirectObjectHolder() : m_LastObjNum(0) {} @@ -42,35 +45,59 @@ CPDF_Object* CPDF_IndirectObjectHolder::ParseIndirectObject(uint32_t objnum) { return nullptr; } -uint32_t CPDF_IndirectObjectHolder::AddIndirectObject(CPDF_Object* pObj) { +CPDF_Object* CPDF_IndirectObjectHolder::AddIndirectObject(UniqueObject pObj) { if (pObj->m_ObjNum) - return pObj->m_ObjNum; + return pObj.release(); // TODO(tsepez): shouldn't happen, stop this leak. - m_LastObjNum++; + 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; + m_IndirectObjs[m_LastObjNum].reset(pObj.release()); // Changes deleters. + return m_IndirectObjs[m_LastObjNum].get(); +} + +CPDF_Array* CPDF_IndirectObjectHolder::AddIndirectArray() { + return ToArray(AddIndirectObject(UniqueObject(new CPDF_Array()))); +} + +CPDF_Dictionary* CPDF_IndirectObjectHolder::AddIndirectDictionary() { + return ToDictionary(AddIndirectObject(UniqueObject(new CPDF_Dictionary()))); +} + +CPDF_Dictionary* CPDF_IndirectObjectHolder::AddIndirectDictionary( + const CFX_WeakPtr<CFX_ByteStringPool>& pPool) { + return ToDictionary( + AddIndirectObject(UniqueObject(new CPDF_Dictionary(pPool)))); +} + +CPDF_Stream* CPDF_IndirectObjectHolder::AddIndirectStream() { + return ToStream(AddIndirectObject(UniqueObject(new CPDF_Stream()))); +} + +CPDF_Stream* CPDF_IndirectObjectHolder::AddIndirectStream( + uint8_t* pData, + uint32_t size, + CPDF_Dictionary* pDict) { + return ToStream( + AddIndirectObject(UniqueObject(new CPDF_Stream(pData, size, pDict)))); } bool CPDF_IndirectObjectHolder::ReplaceIndirectObjectIfHigherGeneration( uint32_t objnum, - CPDF_Object* pObj) { + UniqueObject pObj) { if (!objnum || !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].reset(pObj.release()); // Changes deleters. m_LastObjNum = std::max(m_LastObjNum, objnum); return true; } -void CPDF_IndirectObjectHolder::ReleaseIndirectObject(uint32_t objnum) { +void CPDF_IndirectObjectHolder::DeleteIndirectObject(uint32_t objnum) { CPDF_Object* pObj = GetIndirectObject(objnum); if (!pObj || pObj->GetObjNum() == CPDF_Object::kInvalidObjNum) return; |