core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp - Issue 1142713005: Remove FX_Alloc() null checks now that it can't return NULL.

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_render/fpdf_render_loadimage.cpp

Issue 1142713005: Remove FX_Alloc() null checks now that it can't return NULL. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

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:

View side-by-side diff with in-line comments

Download patch

« core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp ('K') | « core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp ('k') | core/src/fpdfdoc/doc_annot.cpp » ('j') | core/src/fxcodec/codec/fx_codec_jbig.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

index 7093edae4797ee4aef7568d283c8cac2cf49e93f..b45d9c3e5d68604bbf341bfbd7d031247d33056f 100644

--- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

@@ -500,9 +500,6 @@ DIB_COMP_DATA* CPDF_DIBSource::GetDecodeAndMaskArray(FX_BOOL& bDefaultDecode, FX

return NULL;

}

DIB_COMP_DATA* pCompData = FX_Alloc(DIB_COMP_DATA, m_nComponents);

- if (pCompData == NULL) {

- return NULL;

- }

int max_data = (1 << m_bpc) - 1;

CPDF_Array* pDecode = m_pDict->GetArray(FX_BSTRC("Decode"));

if (pDecode) {