From d50b172a9d3a05704748f0798b5aaa422485abbd Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 20 May 2015 09:50:37 -0700 Subject: Merge to XFA: Remove FX_Alloc() null checks now that it can't return NULL. Original Review URL: https://codereview.chromium.org/1142713005 R=thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1143663008 --- core/src/fxcodec/codec/fx_codec_jbig.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to '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 278d9cbcf6..8fcd9f4711 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; - } int ret = 0; if(!file_ptr->ReadBlock((void*)m_pJbig2Context->m_src_buf, 0, m_pJbig2Context->m_src_size)) { goto failed; -- cgit v1.2.3