core/src/fxcodec/lbmp/fx_bmp.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/lbmp/fx_bmp.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/lbmp/fx_bmp.cpp

diff --git a/core/src/fxcodec/lbmp/fx_bmp.cpp b/core/src/fxcodec/lbmp/fx_bmp.cpp

index 4c6eb617573c8d6abaa9b753a1bf1d4be1b0796e..e868fdeaefda64981c1f72b7a56ad84c5cc55110 100644

--- a/core/src/fxcodec/lbmp/fx_bmp.cpp

+++ b/core/src/fxcodec/lbmp/fx_bmp.cpp

@@ -882,7 +882,7 @@ FX_BOOL _bmp_encode_image( bmp_compress_struct_p bmp_ptr, FX_LPBYTE& dst_buf, FX

pal_size = sizeof(FX_DWORD) * bmp_ptr->info_header.biClrUsed;

}

dst_size = head_size + sizeof(FX_DWORD) * bmp_ptr->pal_num;

- dst_buf = FX_AllocNL(FX_BYTE, dst_size);

+ dst_buf = FX_TryAlloc(FX_BYTE, dst_size);

if (dst_buf == NULL) {

return FALSE;

}

« no previous file with comments | « core/src/fxcodec/codec/fx_codec.cpp ('k') | core/src/fxcodec/lgif/fx_gif.cpp » ('j') | no next file with comments »