diff options
| author | thestig <thestig@chromium.org> | 2016-08-25 09:13:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-25 09:13:52 -0700 |
| commit | 695aac5f1f53088659f9b525a692002044e3b098 (patch) | |
| tree | 15d0de637e17c14f58d8ad61ec3fda765afadf3c /core/fpdfdoc/cpdf_formfield.cpp | |
| parent | 43cbe9ea0ff1d0d8b0a7a5c84e5a96f83aec78c1 (diff) | |
| download | pdfium-695aac5f1f53088659f9b525a692002044e3b098.tar.xz | |
Fix infinite loops in FPDF_GetFullName().
BUG=444446
Review-Url: https://codereview.chromium.org/2271373003
Diffstat (limited to 'core/fpdfdoc/cpdf_formfield.cpp')
| -rw-r--r-- | core/fpdfdoc/cpdf_formfield.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp index ac6c01bae2..8d7d0b4dc0 100644 --- a/core/fpdfdoc/cpdf_formfield.cpp +++ b/core/fpdfdoc/cpdf_formfield.cpp @@ -6,6 +6,8 @@ #include "core/fpdfdoc/include/cpdf_formfield.h" +#include <set> + #include "core/fpdfapi/fpdf_parser/include/cfdf_document.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" @@ -16,6 +18,7 @@ #include "core/fpdfdoc/cpvt_generateap.h" #include "core/fpdfdoc/include/cpdf_formcontrol.h" #include "core/fpdfdoc/include/cpdf_interform.h" +#include "third_party/base/stl_util.h" namespace { @@ -65,16 +68,20 @@ CPDF_Object* FPDF_GetFieldAttr(CPDF_Dictionary* pFieldDict, CFX_WideString FPDF_GetFullName(CPDF_Dictionary* pFieldDict) { CFX_WideString full_name; + std::set<CPDF_Dictionary*> visited; CPDF_Dictionary* pLevel = pFieldDict; while (pLevel) { + visited.insert(pLevel); CFX_WideString short_name = pLevel->GetUnicodeTextBy("T"); - if (short_name != L"") { - if (full_name == L"") + if (!short_name.IsEmpty()) { + if (full_name.IsEmpty()) full_name = short_name; else full_name = short_name + L"." + full_name; } pLevel = pLevel->GetDictBy("Parent"); + if (pdfium::ContainsKey(visited, pLevel)) + break; } return full_name; } @@ -679,8 +686,8 @@ int CPDF_FormField::InsertOption(CFX_WideString csOptLabel, m_pDict->SetAt("Opt", pOpt); } - int iCount = (int)pOpt->GetCount(); - if (index < 0 || index >= iCount) { + int iCount = pdfium::base::checked_cast<int, size_t>(pOpt->GetCount()); + if (index >= iCount) { pOpt->AddString(csStr); index = iCount; } else { |