core/src/fxcodec/codec/fx_codec.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/fxcodec/codec/fx_codec.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/fxcodec/codec/fx_codec.cpp

diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp

index 36dff5e5b21e29eab4118270f6f18999bd559156..0c30684e681b8e22a9e4f0bab7552942dba726a8 100644

--- a/core/src/fxcodec/codec/fx_codec.cpp

+++ b/core/src/fxcodec/codec/fx_codec.cpp

@@ -123,7 +123,7 @@ void CCodec_ScanlineDecoder::DownScale(int dest_width, int dest_height)

FX_Free(m_pDataCache);

m_pDataCache = NULL;

}

- m_pDataCache = (CCodec_ImageDataCache*)FX_AllocNL(FX_BYTE, sizeof(CCodec_ImageDataCache) + m_Pitch * m_OutputHeight);

+ m_pDataCache = (CCodec_ImageDataCache*)FX_TryAlloc(FX_BYTE, sizeof(CCodec_ImageDataCache) + m_Pitch * m_OutputHeight);

if (m_pDataCache == NULL) {

return;

}

« no previous file with comments | « core/include/fxcrt/fx_system.h ('k') | core/src/fxcodec/lbmp/fx_bmp.cpp » ('j') | no next file with comments »