From e07edce5b253bc4f2bef6888c5b1cbf0b320a919 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 23 Aug 2016 20:14:27 -0700 Subject: Make indirect object holder private. This CL moves the m_IndirectObjs map to be private to the IndirectObjectHolder. Various bits of code have been updated to use the accessors to the map. This CL fixes the issue with the last time this landed by removing the objnum check from GetIndirectObject() which appears to have caused the crashes. Review-Url: https://codereview.chromium.org/2275703002 --- core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h') diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h b/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h index 31e0aba5ea..27a9bc39db 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h @@ -22,6 +22,7 @@ class CPDF_IndirectObjectHolder { explicit CPDF_IndirectObjectHolder(CPDF_Parser* pParser); ~CPDF_IndirectObjectHolder(); + CPDF_Object* GetIndirectObject(uint32_t objnum) const; CPDF_Object* GetOrParseIndirectObject(uint32_t objnum); void ReleaseIndirectObject(uint32_t objnum); @@ -40,10 +41,10 @@ class CPDF_IndirectObjectHolder { protected: CPDF_Parser* m_pParser; - std::map m_IndirectObjs; private: uint32_t m_LastObjNum; + std::map m_IndirectObjs; }; #endif // CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_INDIRECT_OBJECT_HOLDER_H_ -- cgit v1.2.3