core/src/fxge/dib/fx_dib_convert.cpp - Issue 1144683002: Merge to XFA: Abort on OOM by default in FX_Alloc().

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_convert.cpp

Issue 1144683002: Merge to XFA: Abort on OOM by default in FX_Alloc(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Suppress failing tests 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_convert.cpp

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

index cfcbc707cd7e290e882584fe50e3d64a02f51e49..69432fde4df385d47d3c0e772741ca5568f2332f 100644

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

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

@@ -1015,7 +1015,7 @@ FX_BOOL CFX_DIBitmap::ConvertFormat(FXDIB_Format dest_format, void* pIccTransfor

}

int dest_bpp = dest_format & 0xff;

int dest_pitch = (dest_bpp * m_Width + 31) / 32 * 4;

- FX_LPBYTE dest_buf = FX_AllocNL(FX_BYTE, dest_pitch * m_Height + 4);

+ FX_LPBYTE dest_buf = FX_TryAlloc(FX_BYTE, dest_pitch * m_Height + 4);

if (dest_buf == NULL) {

return FALSE;

}

« no previous file with comments | « core/src/fxcrt/fx_basic_memmgr_unittest.cpp ('k') | core/src/fxge/dib/fx_dib_engine.cpp » ('j') | no next file with comments »