summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_object.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-10-17 17:57:51 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-10-17 17:57:51 +0000
commit5ae6c564d16ce8b625df3d1950abc822f9ecc987 (patch)
tree96bb64df3166e46db397e405789588bf8dc53842 /core/fpdfapi/parser/cpdf_object.h
parent785a26dc649af80c593f899a606dff4dae7c48fd (diff)
downloadpdfium-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_object.h')
-rw-r--r--core/fpdfapi/parser/cpdf_object.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/core/fpdfapi/parser/cpdf_object.h b/core/fpdfapi/parser/cpdf_object.h
index 6c6b583963..4f64aec265 100644
--- a/core/fpdfapi/parser/cpdf_object.h
+++ b/core/fpdfapi/parser/cpdf_object.h
@@ -115,16 +115,13 @@ class CPDF_Object {
CPDF_IndirectObjectHolder* holder) const;
protected:
- CPDF_Object() : m_ObjNum(0), m_GenNum(0) {}
+ CPDF_Object() = default;
+ CPDF_Object(const CPDF_Object& src) = delete;
std::unique_ptr<CPDF_Object> CloneObjectNonCyclic(bool bDirect) const;
- uint32_t m_ObjNum;
-
- private:
- CPDF_Object(const CPDF_Object& src) {}
-
- uint32_t m_GenNum;
+ uint32_t m_ObjNum = 0;
+ uint32_t m_GenNum = 0;
};
template <typename T>