diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-10-17 17:57:51 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-17 17:57:51 +0000 |
commit | 5ae6c564d16ce8b625df3d1950abc822f9ecc987 (patch) | |
tree | 96bb64df3166e46db397e405789588bf8dc53842 /core/fpdfapi/parser/cpdf_array.h | |
parent | 785a26dc649af80c593f899a606dff4dae7c48fd (diff) | |
download | pdfium-5ae6c564d16ce8b625df3d1950abc822f9ecc987.tar.xz |
Add CPDF_{Array,Dictionary}Locker to catch illegal iteration patterns.
Move begin/end methods onto locker object which tracks whether
iterators are in existence.
Change-Id: Ia869f313fce48d10a0d0180d0cc083eed6ea1584
Reviewed-on: https://pdfium-review.googlesource.com/c/44070
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_array.h')
-rw-r--r-- | core/fpdfapi/parser/cpdf_array.h | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h index 0905251382..f7b4a1fc9e 100644 --- a/core/fpdfapi/parser/cpdf_array.h +++ b/core/fpdfapi/parser/cpdf_array.h @@ -108,17 +108,38 @@ class CPDF_Array final : public CPDF_Object { void Clear(); void RemoveAt(size_t index); void ConvertToIndirectObjectAt(size_t index, CPDF_IndirectObjectHolder* pDoc); - - const_iterator begin() const { return m_Objects.begin(); } - const_iterator end() const { return m_Objects.end(); } + bool IsLocked() const { return !!m_LockCount; } private: + friend class CPDF_ArrayLocker; + std::unique_ptr<CPDF_Object> CloneNonCyclic( bool bDirect, std::set<const CPDF_Object*>* pVisited) const override; std::vector<std::unique_ptr<CPDF_Object>> m_Objects; WeakPtr<ByteStringPool> m_pPool; + mutable uint32_t m_LockCount = 0; +}; + +class CPDF_ArrayLocker { + public: + using const_iterator = CPDF_Array::const_iterator; + + explicit CPDF_ArrayLocker(const CPDF_Array* pArray); + ~CPDF_ArrayLocker(); + + const_iterator begin() const { + CHECK(m_pArray->IsLocked()); + return m_pArray->m_Objects.begin(); + } + const_iterator end() const { + CHECK(m_pArray->IsLocked()); + return m_pArray->m_Objects.end(); + } + + private: + UnownedPtr<const CPDF_Array> const m_pArray; }; inline CPDF_Array* ToArray(CPDF_Object* obj) { |