Remove foo != NULL outside of xfa/

core/src/fxcodec/codec/fx_codec_png.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
@@ skipping 87 matching lines @@
   void* child_ptr;
 
   void* (*m_AllocFunc)(unsigned int);
   void (*m_FreeFunc)(void*);
 };
 extern "C" {
 static void* _png_alloc_func(unsigned int size) {
   return FX_Alloc(char, size);
 }
 static void _png_free_func(void* p) {
-  if (p != NULL) {
-    FX_Free(p);
-  }
+  FX_Free(p);
 }
 };
 static void _png_get_header_func(png_structp png_ptr, png_infop info_ptr) {
   FXPNG_Context* p = (FXPNG_Context*)png_get_progressive_ptr(png_ptr);
   if (p == NULL) {
     return;
   }
   CCodec_PngModule* pModule = (CCodec_PngModule*)p->parent_ptr;
   if (pModule == NULL) {
     return;
@@ skipping 64 matching lines @@
                               int pass) {
   FXPNG_Context* p = (FXPNG_Context*)png_get_progressive_ptr(png_ptr);
   if (p == NULL) {
     return;
   }
   CCodec_PngModule* pModule = (CCodec_PngModule*)p->parent_ptr;
   uint8_t* src_buf = NULL;
   if (!pModule->AskScanlineBufCallback(p->child_ptr, row_num, src_buf)) {
     png_error(png_ptr, "Ask Scanline buffer Callback Error");
   }
-  if (src_buf != NULL) {
+  if (src_buf) {
     png_progressive_combine_row(png_ptr, src_buf, new_row);
   }
   pModule->FillScanlineBufCompletedCallback(p->child_ptr, pass, row_num);
 }
 void* CCodec_PngModule::Start(void* pModule) {
   FXPNG_Context* p = (FXPNG_Context*)FX_Alloc(uint8_t, sizeof(FXPNG_Context));
   if (p == NULL) {
     return NULL;
   }
   p->m_AllocFunc = _png_alloc_func;
   p->m_FreeFunc = _png_free_func;
   p->png_ptr = NULL;
   p->info_ptr = NULL;
   p->parent_ptr = (void*)this;
   p->child_ptr = pModule;
   p->png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
   if (p->png_ptr == NULL) {
     FX_Free(p);
     return NULL;
   }
   p->info_ptr = png_create_info_struct(p->png_ptr);
   if (p->info_ptr == NULL) {
     png_destroy_read_struct(&(p->png_ptr), (png_infopp)NULL, (png_infopp)NULL);
     FX_Free(p);
     return NULL;
   }
   if (setjmp(png_jmpbuf(p->png_ptr))) {
-    if (p != NULL) {
+    if (p) {
       png_destroy_read_struct(&(p->png_ptr), &(p->info_ptr), (png_infopp)NULL);
       FX_Free(p);
     }
     return NULL;
   }
   png_set_progressive_read_fn(p->png_ptr, p, _png_get_header_func,
                               _png_get_row_func, _png_get_end_func);
   png_set_error_fn(p->png_ptr, m_szLastError, (png_error_ptr)_png_error_data,
                    (png_error_ptr)_png_warning_data);
   return p;
 }
 void CCodec_PngModule::Finish(void* pContext) {
   FXPNG_Context* p = (FXPNG_Context*)pContext;
-  if (p != NULL) {
+  if (p) {
     png_destroy_read_struct(&(p->png_ptr), &(p->info_ptr), (png_infopp)NULL);
     p->m_FreeFunc(p);
   }
 }
 FX_BOOL CCodec_PngModule::Input(void* pContext,
                                 const uint8_t* src_buf,
                                 FX_DWORD src_size,
                                 CFX_DIBAttribute* pAttribute) {
   FXPNG_Context* p = (FXPNG_Context*)pContext;
   if (setjmp(png_jmpbuf(p->png_ptr))) {
     if (pAttribute &&
         0 == FXSYS_strcmp(m_szLastError, "Read Header Callback Error")) {
       _png_load_bmp_attribute(p->png_ptr, p->info_ptr, pAttribute);
     }
     return FALSE;
   }
   png_process_data(p->png_ptr, p->info_ptr, (uint8_t*)src_buf, src_size);
   return TRUE;
 }