diff options
author | dsinclair <dsinclair@chromium.org> | 2016-08-22 10:24:43 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-08-22 10:24:43 -0700 |
commit | 8d6c929d2605dc568beb73aab2c585622947fee2 (patch) | |
tree | 9144254a1bcd59bad80dd4d06d17a96977966c47 /core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp | |
parent | a4f46c57f4e4217f50e98ac74b360793284ee73f (diff) | |
download | pdfium-8d6c929d2605dc568beb73aab2c585622947fee2.tar.xz |
Revert of Move parser pointer to CPDF_Document (patchset #6 id:100001 of https://codereview.chromium.org/2253723002/ )
Reason for revert:
Causing asan issues. See crbug.com/639451.
Original issue's description:
> Move parser pointer to CPDF_Document
>
> The CPDF_IndirectObjectHolder has two subclasses, CPDF_Document and
> CFDF_Document. The CPDF document requires the parser and the CFDF document
> does not. This cl moves the parser pointer up to CPDF_Document.
>
> Committed: https://pdfium.googlesource.com/pdfium/+/260f5fbf3553a96fa49b029cc050220039c30e2a
TBR=tsepez@chromium.org,thestig@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
Review-Url: https://codereview.chromium.org/2266033002
Diffstat (limited to 'core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp')
-rw-r--r-- | core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp | 74 |
1 files changed, 35 insertions, 39 deletions
diff --git a/core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp index 0d3e68e86f..33f45a53bf 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp @@ -9,38 +9,39 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h" -CPDF_IndirectObjectHolder::CPDF_IndirectObjectHolder() : m_LastObjNum(0) {} +CPDF_IndirectObjectHolder::CPDF_IndirectObjectHolder(CPDF_Parser* pParser) + : m_pParser(pParser), m_LastObjNum(0) { + if (pParser) + m_LastObjNum = m_pParser->GetLastObjNum(); +} CPDF_IndirectObjectHolder::~CPDF_IndirectObjectHolder() { for (const auto& pair : m_IndirectObjs) pair.second->Destroy(); } -CPDF_Object* CPDF_IndirectObjectHolder::GetIndirectObject( - uint32_t objnum) const { +CPDF_Object* CPDF_IndirectObjectHolder::GetIndirectObject(uint32_t objnum) { if (objnum == 0) return nullptr; auto it = m_IndirectObjs.find(objnum); - return it != m_IndirectObjs.end() ? it->second : nullptr; -} - -CPDF_Object* CPDF_IndirectObjectHolder::ParseIndirectObject(uint32_t objnum) { - return nullptr; -} + if (it != m_IndirectObjs.end()) + return it->second->GetObjNum() != CPDF_Object::kInvalidObjNum ? it->second + : nullptr; -CPDF_Object* CPDF_IndirectObjectHolder::GetOrParseIndirectObject( - uint32_t objnum) { - CPDF_Object* pObj = GetIndirectObject(objnum); - if (pObj) - return pObj->GetObjNum() != CPDF_Object::kInvalidObjNum ? pObj : nullptr; + if (!m_pParser) + return nullptr; - pObj = ParseIndirectObject(objnum); + CPDF_Object* pObj = m_pParser->ParseIndirectObject(this, objnum); if (!pObj) return nullptr; pObj->m_ObjNum = objnum; - ReplaceIndirectObject(pObj); + m_LastObjNum = std::max(m_LastObjNum, objnum); + if (m_IndirectObjs[objnum]) + m_IndirectObjs[objnum]->Destroy(); + + m_IndirectObjs[objnum] = pObj; return pObj; } @@ -49,41 +50,36 @@ uint32_t CPDF_IndirectObjectHolder::AddIndirectObject(CPDF_Object* pObj) { return pObj->m_ObjNum; m_LastObjNum++; + m_IndirectObjs[m_LastObjNum] = pObj; pObj->m_ObjNum = m_LastObjNum; - ReplaceIndirectObject(pObj); return m_LastObjNum; } void CPDF_IndirectObjectHolder::ReleaseIndirectObject(uint32_t objnum) { - CPDF_Object* pObj = GetIndirectObject(objnum); - if (!pObj || pObj->m_ObjNum == CPDF_Object::kInvalidObjNum) + auto it = m_IndirectObjs.find(objnum); + if (it == m_IndirectObjs.end() || + it->second->GetObjNum() == CPDF_Object::kInvalidObjNum) { return; - - pObj->Destroy(); - m_IndirectObjs.erase(objnum); + } + it->second->Destroy(); + m_IndirectObjs.erase(it); } -bool CPDF_IndirectObjectHolder::ReplaceIndirectObjectIfHigherGeneration( - uint32_t objnum, - CPDF_Object* pObj) { +bool CPDF_IndirectObjectHolder::InsertIndirectObject(uint32_t objnum, + CPDF_Object* pObj) { if (!objnum || !pObj) return false; - CPDF_Object* pOldObj = GetIndirectObject(objnum); - if (pOldObj && pObj->GetGenNum() <= pOldObj->GetGenNum()) { - pObj->Destroy(); - return false; + auto it = m_IndirectObjs.find(objnum); + if (it != m_IndirectObjs.end()) { + if (pObj->GetGenNum() <= it->second->GetGenNum()) { + pObj->Destroy(); + return false; + } + it->second->Destroy(); } - pObj->m_ObjNum = objnum; - ReplaceIndirectObject(pObj); + m_IndirectObjs[objnum] = pObj; + m_LastObjNum = std::max(m_LastObjNum, objnum); return true; } - -void CPDF_IndirectObjectHolder::ReplaceIndirectObject(CPDF_Object* pObj) { - m_LastObjNum = std::max(m_LastObjNum, pObj->m_ObjNum); - if (m_IndirectObjs[pObj->m_ObjNum]) - m_IndirectObjs[pObj->m_ObjNum]->Destroy(); - - m_IndirectObjs[pObj->m_ObjNum] = pObj; -} |