core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp - Issue 1582963003: Fix some iterator invalidation issues while traversing CPDF_Dictionary.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

Issue 1582963003: Fix some iterator invalidation issues while traversing CPDF_Dictionary. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: fix a bug in CPDF_Dictionary::ReplaceKey while we're at it Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« core/include/fpdfapi/fpdf_objects.h ('K') | « core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp ('k') | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp » ('j') | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

index e0ce3faadfeaadfc7ad83a9141cc1564eaeae7c9..cad8d7701d7b074635a47d55ce5183714e43318e 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)

Lei Zhang 2016/01/14 01:32:29 Can't we move this to the top and check if |oldkey

Oliver Chang 2016/01/14 01:44:21 Hmm, I did that at first, but thought that this wa

+ return;

if (new_it != m_Map.end()) {

new_it->second->Release();

new_it->second = old_it->second;