diff options
author | Lei Zhang <thestig@chromium.org> | 2015-10-09 13:57:36 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-10-09 13:57:36 -0700 |
commit | 5428555d7bca8116fa8c6d6914674f2c2adb17ac (patch) | |
tree | f8217f4229aa6eecc33134a0c8ab9013b20e7fc6 /core/src/fxcodec/jbig2/JBig2_SymbolDict.h | |
parent | e7bd5081be68feb4978659a0c18090314ff44d09 (diff) | |
download | pdfium-5428555d7bca8116fa8c6d6914674f2c2adb17ac.tar.xz |
Merge to XFA: Sanitize CJBig2_SymbolDict's memory usage.
- Use std::vector<JBig2ArithCtx> instead of storing pointers to arrays.
- Make CJBig2_SymbolDict's members private with accessors.
- Use std::vector<JBig2ArithCtx> in related places.
- Steal Chromium's vector_as_array() and use it as an adaptor as needed.
BUG=514891
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1388203003 .
(cherry picked from commit 3acb1ef909a22368507ed13817c4988c818e3aee)
Review URL: https://codereview.chromium.org/1401533004 .
Diffstat (limited to 'core/src/fxcodec/jbig2/JBig2_SymbolDict.h')
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_SymbolDict.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h index 577bfbc2f2..6ff4c2efe2 100644 --- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h +++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h @@ -7,12 +7,14 @@ #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_SYMBOLDICT_H_ #define CORE_SRC_FXCODEC_JBIG2_JBIG2_SYMBOLDICT_H_ +#include <vector> + #include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fxcrt/fx_basic.h" +#include "JBig2_ArithDecoder.h" #include "JBig2_List.h" class CJBig2_Image; -struct JBig2ArithCtx; class CJBig2_SymbolDict { public: @@ -27,12 +29,19 @@ class CJBig2_SymbolDict { size_t NumImages() const { return m_SDEXSYMS.size(); } CJBig2_Image* GetImage(size_t index) const { return m_SDEXSYMS.get(index); } - public: - FX_BOOL m_bContextRetained; - JBig2ArithCtx* m_gbContext; - JBig2ArithCtx* m_grContext; + const std::vector<JBig2ArithCtx>& GbContext() const { return m_gbContext; } + const std::vector<JBig2ArithCtx>& GrContext() const { return m_grContext; } + + void SetGbContext(const std::vector<JBig2ArithCtx>& gbContext) { + m_gbContext = gbContext; + } + void SetGrContext(const std::vector<JBig2ArithCtx>& grContext) { + m_grContext = grContext; + } private: + std::vector<JBig2ArithCtx> m_gbContext; + std::vector<JBig2ArithCtx> m_grContext; CJBig2_List<CJBig2_Image> m_SDEXSYMS; }; |