core/src/fxcrt/fx_basic_array.cpp - Issue 1143663004: 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/fxcrt/fx_basic_array.cpp

Issue 1143663004: Add safe FX_Alloc2D() macro (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Drop one file, indent. 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/fxcrt/fx_basic_array.cpp

diff --git a/core/src/fxcrt/fx_basic_array.cpp b/core/src/fxcrt/fx_basic_array.cpp

index 9bdc607bfea70d444e3edde2fd7cd065f67bfcd4..5a2a2e54a189e94fbbc305ecc25684ac0701992e 100644

--- a/core/src/fxcrt/fx_basic_array.cpp

+++ b/core/src/fxcrt/fx_basic_array.cpp

@@ -189,10 +189,7 @@ void* CFX_BaseSegmentedArray::Add()

if (m_DataSize % m_SegmentSize) {

return GetAt(m_DataSize ++);

}

- void* pSegment = FX_Alloc(FX_BYTE, m_UnitSize * m_SegmentSize);

- if (!pSegment) {

- return NULL;

- }

+ void* pSegment = FX_Alloc2D(FX_BYTE, m_UnitSize, m_SegmentSize);

if (m_pIndex == NULL) {

m_pIndex = pSegment;

m_DataSize ++;