core/src/fxcodec/codec/fx_codec_jbig.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/fxcodec/codec/fx_codec_jbig.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/fxcodec/codec/fx_codec_icc.cpp ('k') | core/src/fxcodec/codec/fx_codec_jpx_opj.cpp » ('j') | core/src/fxge/ge/fx_ge_path.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: core/src/fxcodec/codec/fx_codec_jbig.cpp

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

index 278d9cbcf60105311cda7335f0d964d67e7f000f..8fcd9f47116e95ebf71c4d3484071ac2a815a4b2 100644

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

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

@@ -53,9 +53,6 @@ FX_BOOL CCodec_Jbig2Module::Decode(IFX_FileRead* file_ptr,

CJBig2_Image* dest_image = NULL;

FX_DWORD src_size = (FX_DWORD)file_ptr->GetSize();

FX_LPBYTE src_buf = FX_Alloc(FX_BYTE, src_size);

- if (src_buf == NULL) {

- return FALSE;

- }

int ret = 0;

if(!file_ptr->ReadBlock(src_buf, 0, src_size)) {

goto failed;

@@ -133,9 +130,6 @@ FXCODEC_STATUS CCodec_Jbig2Module::StartDecode(void* pJbig2Context, IFX_FileRead

m_pJbig2Context->m_dest_image = NULL;

m_pJbig2Context->m_src_size = (FX_DWORD)file_ptr->GetSize();

m_pJbig2Context->m_src_buf = FX_Alloc(FX_BYTE, m_pJbig2Context->m_src_size);

- if (m_pJbig2Context->m_src_buf == NULL) {

- return FXCODEC_STATUS_ERR_MEMORY;

Lei Zhang 2015/05/19 18:58:53 BTW, this is the only use of FXCODEC_STATUS_ERR_ME

Tom Sepez 2015/05/19 20:08:57 Removing it from the code.

- }

int ret = 0;

if(!file_ptr->ReadBlock((void*)m_pJbig2Context->m_src_buf, 0, m_pJbig2Context->m_src_size)) {

goto failed;