core/src/fpdfdoc/doc_tagged.cpp - Issue 680873002: Protect against a seg fault in CPDF_StructElementImpl constructor.

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/fpdfdoc/doc_tagged.cpp

Issue 680873002: Protect against a seg fault in CPDF_StructElementImpl constructor. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master

Patch Set: Created 6 years, 2 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

Index: core/src/fpdfdoc/doc_tagged.cpp

diff --git a/core/src/fpdfdoc/doc_tagged.cpp b/core/src/fpdfdoc/doc_tagged.cpp

index 698157356c228fda50755f84945d36dbe4e038ab..5a114071ccf0cb080ae4958194dc7c42dc590451 100644

--- a/core/src/fpdfdoc/doc_tagged.cpp

+++ b/core/src/fpdfdoc/doc_tagged.cpp

@@ -217,9 +217,11 @@ CPDF_StructElementImpl::CPDF_StructElementImpl(CPDF_StructTreeImpl* pTree, CPDF_

m_pTree = pTree;

m_pDict = pDict;

m_Type = pDict->GetString(FX_BSTRC("S"));

- CFX_ByteString mapped = pTree->m_pRoleMap->GetString(m_Type);

- if (!mapped.IsEmpty()) {

- m_Type = mapped;

+ if (pTree->m_pRoleMap != NULL) {

Tom Sepez 2014/11/05 17:57:03 nit: != NULL is redundant. Just if (pTree->m_p

olsen 2014/11/10 00:24:43 Done.

+ CFX_ByteString mapped = pTree->m_pRoleMap->GetString(m_Type);

+ if (!mapped.IsEmpty()) {

+ m_Type = mapped;

+ }

}

m_pParent = pParent;

LoadKids(pDict);

« no previous file with comments | « no previous file | no next file » | no next file with comments »