core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp - Issue 1136673005: Merge to XFA: Add safe FX_Alloc2D() macro

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_font/fpdf_font_cid.cpp

Issue 1136673005: Merge to XFA: Add safe FX_Alloc2D() macro (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

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

Index: core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp

diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp

index 6911942c0e8ca454b8ec7628e0b89bd27f3c86f6..a08660c52fcf6a0500e1b07dac77222311d73854 100644

--- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp

+++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp

@@ -254,7 +254,7 @@ void CPDF_CMapParser::ParseWord(FX_BSTR word)

if (nSegs > 1) {

m_pCMap->m_CodingScheme = CPDF_CMap::MixedFourBytes;

m_pCMap->m_nCodeRanges = nSegs;

- m_pCMap->m_pLeadingBytes = FX_Alloc(FX_BYTE, nSegs * sizeof(_CMap_CodeRange));

+ m_pCMap->m_pLeadingBytes = FX_Alloc2D(FX_BYTE, nSegs, sizeof(_CMap_CodeRange));

FXSYS_memcpy32(m_pCMap->m_pLeadingBytes, m_CodeRanges.GetData(), nSegs * sizeof(_CMap_CodeRange));

} else if (nSegs == 1) {

m_pCMap->m_CodingScheme = (m_CodeRanges[0].m_CharSize == 2) ? CPDF_CMap::TwoBytes : CPDF_CMap::OneByte;