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/fpdfdoc | |
| 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/fpdfdoc')
| -rw-r--r-- | core/fpdfdoc/cpdf_formcontrol.cpp | 4 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_formfield.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_interform.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdfdoc/cpdf_formcontrol.cpp b/core/fpdfdoc/cpdf_formcontrol.cpp index 7bb9c832ba..d0b4a2dced 100644 --- a/core/fpdfdoc/cpdf_formcontrol.cpp +++ b/core/fpdfdoc/cpdf_formcontrol.cpp @@ -68,7 +68,7 @@ void CPDF_FormControl::SetOnStateName(const CFX_ByteString& csOn) { return; for (const auto& it : *pAP) { - CPDF_Object* pObj1 = it.second.get(); + CPDF_Object* pObj1 = it.second; if (!pObj1) continue; @@ -80,7 +80,7 @@ void CPDF_FormControl::SetOnStateName(const CFX_ByteString& csOn) { auto subdict_it = pSubDict->begin(); while (subdict_it != pSubDict->end()) { const CFX_ByteString& csKey2 = subdict_it->first; - CPDF_Object* pObj2 = subdict_it->second.get(); + CPDF_Object* pObj2 = subdict_it->second; ++subdict_it; if (!pObj2) continue; diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp index fbe2f052c4..dc45fbcec7 100644 --- a/core/fpdfdoc/cpdf_formfield.cpp +++ b/core/fpdfdoc/cpdf_formfield.cpp @@ -839,7 +839,7 @@ FX_BOOL CPDF_FormField::IsOptionSelected(int iOptIndex) const { if (!pArray) return FALSE; - for (const auto& pObj : *pArray) { + for (CPDF_Object* pObj : *pArray) { if (pObj->GetInteger() == iOptIndex) return TRUE; } diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp index 3bef85ef9c..b8b4b68e29 100644 --- a/core/fpdfdoc/cpdf_interform.cpp +++ b/core/fpdfdoc/cpdf_interform.cpp @@ -138,7 +138,7 @@ CPDF_Font* GetNativeFont(CPDF_Dictionary* pFormDict, for (const auto& it : *pFonts) { const CFX_ByteString& csKey = it.first; - CPDF_Object* pObj = it.second.get(); + CPDF_Object* pObj = it.second; if (!pObj) continue; @@ -179,7 +179,7 @@ FX_BOOL FindFont(CPDF_Dictionary* pFormDict, for (const auto& it : *pFonts) { const CFX_ByteString& csKey = it.first; - CPDF_Object* pObj = it.second.get(); + CPDF_Object* pObj = it.second; if (!pObj) continue; @@ -216,7 +216,7 @@ FX_BOOL FindFont(CPDF_Dictionary* pFormDict, for (const auto& it : *pFonts) { const CFX_ByteString& csKey = it.first; - CPDF_Object* pObj = it.second.get(); + CPDF_Object* pObj = it.second; if (!pObj) continue; |