diff options
| author | weili <weili@chromium.org> | 2016-08-23 22:08:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-23 22:08:37 -0700 |
| commit | a470b5e5371d0674d06068ec38d0d3c3279e85e1 (patch) | |
| tree | e13f893084515082052e30c1cb8d94ec6303e38b /core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h | |
| parent | 0dadcc6fdab7ad1f2ee95d763f31aad5d3534f93 (diff) | |
| download | pdfium-a470b5e5371d0674d06068ec38d0d3c3279e85e1.tar.xz | |
Fix stack overflow in object Clone() functions
For some complex objects such as CPDF_Dictionary, CPDF_Array,
CPDF_Stream, and CPDF_Reference, Clone() could be executed with
infinite recursion to cause the stack overflow. Fix this by
checking already cloned objects to avoid recursion.
BUG=pdfium:513
Review-Url: https://codereview.chromium.org/2250533002
Diffstat (limited to 'core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h')
| -rw-r--r-- | core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h b/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h index 29846366d9..be79737add 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h @@ -8,6 +8,7 @@ #define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DICTIONARY_H_ #include <map> +#include <set> #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" #include "core/fxcrt/include/fx_coordinates.h" @@ -24,7 +25,7 @@ class CPDF_Dictionary : public CPDF_Object { // CPDF_Object. Type GetType() const override; - CPDF_Object* Clone(FX_BOOL bDirect = FALSE) const override; + CPDF_Object* Clone() const override; CPDF_Dictionary* GetDict() const override; bool IsDictionary() const override; CPDF_Dictionary* AsDictionary() override; @@ -85,6 +86,10 @@ class CPDF_Dictionary : public CPDF_Object { protected: ~CPDF_Dictionary() override; + CPDF_Object* CloneNonCyclic( + bool bDirect, + std::set<const CPDF_Object*>* visited) const override; + std::map<CFX_ByteString, CPDF_Object*> m_Map; }; |