diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-17 11:13:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-17 11:13:54 -0700 |
| commit | d5bd8a16565bbee05bfb8a8409f3ba90c461da0e (patch) | |
| tree | a36c7a23c77ca3d2990109b419b823e801978e67 /core/fpdfapi/parser/cpdf_array.h | |
| parent | 522ed14ce8cf39e5e6fc1a58099edd4f849b7fb8 (diff) | |
| download | pdfium-d5bd8a16565bbee05bfb8a8409f3ba90c461da0e.tar.xz | |
Revert "Make CPDF_Object containers hold objects via unique pointers."
This reverts commit 1d023881cd53485303c0fcc0b5878e700dc470fd.
Reason for revert -- fuzzers hit issues.
TBR=thestig@chromium.org
Review-Url: https://codereview.chromium.org/2425783002
Diffstat (limited to 'core/fpdfapi/parser/cpdf_array.h')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_array.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h index f473e26800..8cfa0333bb 100644 --- a/core/fpdfapi/parser/cpdf_array.h +++ b/core/fpdfapi/parser/cpdf_array.h @@ -17,8 +17,8 @@ class CPDF_Array : public CPDF_Object { public: - using iterator = std::vector<UniqueObject>::iterator; - using const_iterator = std::vector<UniqueObject>::const_iterator; + using iterator = std::vector<CPDF_Object*>::iterator; + using const_iterator = std::vector<CPDF_Object*>::const_iterator; CPDF_Array(); @@ -67,9 +67,8 @@ class CPDF_Array : public CPDF_Object { bool bDirect, std::set<const CPDF_Object*>* pVisited) const override; - std::vector<UniqueObject> m_Objects; + std::vector<CPDF_Object*> m_Objects; }; - using UniqueArray = std::unique_ptr<CPDF_Array, ReleaseDeleter<CPDF_Object>>; inline CPDF_Array* ToArray(CPDF_Object* obj) { |