core/src/fpdfapi/fpdf_edit/fpdf_edit_image.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/fpdfapi/fpdf_edit/fpdf_edit_image.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/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

index 3a3756de5d748c563f95890edf89fa732b12f71d..1328fcdf96a4d9a0401b7bff9ee33ab0ac6cd968 100644

--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

@@ -162,7 +162,7 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap, FX_INT32 iCompress, IFX_F

pCS->AddName(FX_BSTRC("Indexed"));

pCS->AddName(FX_BSTRC("DeviceRGB"));

pCS->AddInteger(iPalette - 1);

- FX_LPBYTE pColorTable = FX_Alloc(FX_BYTE, iPalette * 3);

+ FX_LPBYTE pColorTable = FX_Alloc2D(FX_BYTE, iPalette, 3);

FX_LPBYTE ptr = pColorTable;

for (FX_INT32 i = 0; i < iPalette; i ++) {

FX_DWORD argb = pBitmap->GetPaletteArgb(i);

« no previous file with comments | « core/include/fxcrt/fx_memory.h ('k') | core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp » ('j') | no next file with comments »