core/src/fxcodec/codec/fx_codec_jpeg.cpp - Issue 1136673005: Merge to XFA: 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/fxcodec/codec/fx_codec_jpeg.cpp

Issue 1136673005: Merge to XFA: Add safe FX_Alloc2D() macro (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: 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_jpeg.cpp

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

index 99c54e75cbb5f9b6873adc8756c477feba46d652..e2fc9169c821b05edd6297534c2e9d03758a7a0d 100644

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

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

@@ -215,10 +215,7 @@ static void _JpegEncode(const CFX_DIBSource* pSource, FX_LPBYTE& dest_buf, FX_ST

}

FX_LPBYTE line_buf = NULL;

if (nComponents > 1) {

- line_buf = FX_Alloc(FX_BYTE, width * nComponents);

- if (line_buf == NULL) {

- return;

- }

+ line_buf = FX_Alloc2D(FX_BYTE, width, nComponents);

}

jpeg_set_defaults(&cinfo);

if(quality != 75) {

« no previous file with comments | « core/src/fxcodec/codec/fx_codec_flate.cpp ('k') | core/src/fxcrt/fx_basic_array.cpp » ('j') | no next file with comments »