diff options
author | Oliver Chang <ochang@chromium.org> | 2016-01-13 18:46:09 -0800 |
---|---|---|
committer | Oliver Chang <ochang@chromium.org> | 2016-01-13 18:46:09 -0800 |
commit | bd292ae8c0ca1793e8824add13bc8231cec3bc75 (patch) | |
tree | f9c90ff5288681aa9d5550e23c5e278b6f794ab2 /core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | |
parent | 81ec24c0fe046dcb7006ce69682c731a09205231 (diff) | |
download | pdfium-bd292ae8c0ca1793e8824add13bc8231cec3bc75.tar.xz |
Merge to XFA: Fix some iterator invalidation issues while traversing CPDF_Dictionary.
Also fixes a potential issue in CPDF_Dictionary::ReplaceKey.
TBR=thestig@chromium.org
BUG=577030
Original Review URL: https://codereview.chromium.org/1582963003 .
(cherry picked from commit cae57daaa0f7ed4c92e22c4e7ef30392393d1128)
Review URL: https://codereview.chromium.org/1587703003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp index e0ce3faadf..cad8d7701d 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp @@ -734,6 +734,9 @@ void CPDF_Dictionary::ReplaceKey(const CFX_ByteStringC& oldkey, // Avoid 2 constructions of CFX_ByteString. CFX_ByteString newkey_bytestring = newkey; auto new_it = m_Map.find(newkey_bytestring); + if (new_it == old_it) + return; + if (new_it != m_Map.end()) { new_it->second->Release(); new_it->second = old_it->second; |