core/src/fxge/dib/fx_dib_engine.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/fxge/dib/fx_dib_engine.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/fxge/dib/fx_dib_engine.cpp

diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/src/fxge/dib/fx_dib_engine.cpp

index 5053c306f5e257931f653b7f8eb8a1a113b26c4a..7c40171c2bc5b9d4c47058f95441a2a7c7ae3f82 100644

--- a/core/src/fxge/dib/fx_dib_engine.cpp

+++ b/core/src/fxge/dib/fx_dib_engine.cpp

@@ -316,10 +316,7 @@ FX_BOOL CStretchEngine::StartStretchHorz()

return FALSE;

}

if (m_pSource && m_bHasAlpha && m_pSource->m_pAlphaMask) {

- m_pExtraAlphaBuf = FX_Alloc(unsigned char, m_SrcClip.Height() * m_ExtraMaskPitch);

- if (!m_pExtraAlphaBuf) {

- return FALSE;

- }

+ m_pExtraAlphaBuf = FX_Alloc2D(unsigned char, m_SrcClip.Height(), m_ExtraMaskPitch);

FX_DWORD size = (m_DestClip.Width() * 8 + 31) / 32 * 4;

m_pDestMaskScanline = FX_TryAlloc(unsigned char, size);

if (!m_pDestMaskScanline) {