Cleanup: Do not check pointers before deleting them.

core/src/fxge/dib/fx_dib_main.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 "../../../include/fxge/fx_dib.h"
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "dib_int.h"
@@ skipping 30 matching lines @@
     m_Width = m_Height = 0;
     m_Pitch = 0;
     m_pPalette = NULL;
     m_pAlphaMask = NULL;
 }
 CFX_DIBSource::~CFX_DIBSource()
 {
     if (m_pPalette) {
         FX_Free(m_pPalette);
     }
-    if (m_pAlphaMask) {
-        delete m_pAlphaMask;
-    }
+    delete m_pAlphaMask;
 }
 CFX_DIBitmap::CFX_DIBitmap()
 {
     m_bExtBuf = FALSE;
     m_pBuffer = NULL;
     m_pPalette = NULL;
 }
 #define _MAX_OOM_LIMIT_ 12000000
 FX_BOOL CFX_DIBitmap::Create(int width, int height, FXDIB_Format format, uint8_t* pBuffer, int pitch)
 {
@@ skipping 68 matching lines @@
     m_pBuffer = NULL;
 }
 void CFX_DIBitmap::TakeOver(CFX_DIBitmap* pSrcBitmap)
 {
     if (m_pBuffer && !m_bExtBuf) {
         FX_Free(m_pBuffer);
     }
     if (m_pPalette) {
         FX_Free(m_pPalette);
     }
-    if (m_pAlphaMask) {
-        delete m_pAlphaMask;
-    }
+    delete m_pAlphaMask;
     m_pBuffer = pSrcBitmap->m_pBuffer;
     m_pPalette = pSrcBitmap->m_pPalette;
     m_pAlphaMask = pSrcBitmap->m_pAlphaMask;
     pSrcBitmap->m_pBuffer = NULL;
     pSrcBitmap->m_pPalette = NULL;
     pSrcBitmap->m_pAlphaMask = NULL;
     m_bpp = pSrcBitmap->m_bpp;
     m_bExtBuf = pSrcBitmap->m_bExtBuf;
     m_AlphaFlag = pSrcBitmap->m_AlphaFlag;
     m_Width = pSrcBitmap->m_Width;
@@ skipping 1308 matching lines @@
             delete m_pBitmap;
             m_pBitmap = NULL;
             return;
         }
         m_pBitmap->CopyPalette(pSrc->GetPalette());
         m_pBitmap->CopyAlphaMask(pSrc->m_pAlphaMask);
     }
 }
 CFX_DIBExtractor::~CFX_DIBExtractor()
 {
-    if (m_pBitmap) {
-        delete m_pBitmap;
-    }
+    delete m_pBitmap;
 }
 CFX_FilteredDIB::CFX_FilteredDIB()
 {
     m_pScanline = NULL;
     m_pSrc = NULL;
 }
 CFX_FilteredDIB::~CFX_FilteredDIB()
 {
-    if (m_pSrc && m_bAutoDropSrc) {
+    if (m_bAutoDropSrc) {
         delete m_pSrc;
     }
     if (m_pScanline) {
         FX_Free(m_pScanline);
     }
 }
 void CFX_FilteredDIB::LoadSrc(const CFX_DIBSource* pSrc, FX_BOOL bAutoDropSrc)
 {
     m_pSrc = pSrc;
     m_bAutoDropSrc = bAutoDropSrc;
@@ skipping 19 matching lines @@
 }
 CFX_ImageRenderer::CFX_ImageRenderer()
 {
     m_Status = 0;
     m_pTransformer = NULL;
     m_bRgbByteOrder = FALSE;
     m_BlendType = FXDIB_BLEND_NORMAL;
 }
 CFX_ImageRenderer::~CFX_ImageRenderer()
 {
-    if (m_pTransformer) {
-        delete m_pTransformer;
-    }
+    delete m_pTransformer;
 }
 extern FX_RECT _FXDIB_SwapClipBox(FX_RECT& clip, int width, int height, FX_BOOL bFlipX, FX_BOOL bFlipY);
 FX_BOOL CFX_ImageRenderer::Start(CFX_DIBitmap* pDevice, const CFX_ClipRgn* pClipRgn,
                                  const CFX_DIBSource* pSource, int bitmap_alpha,
                                  FX_DWORD mask_color, const CFX_AffineMatrix* pMatrix,
                                  FX_DWORD dib_flags, FX_BOOL bRgbByteOrder,
                                  int alpha_flag, void* pIccTransform, int blend_type)
 {
     m_Matrix = *pMatrix;
     CFX_FloatRect image_rect_f = m_Matrix.GetUnitRect();
@@ skipping 93 matching lines @@
         return FALSE;
     }
     return FALSE;
 }
 CFX_BitmapStorer::CFX_BitmapStorer()
 {
     m_pBitmap = NULL;
 }
 CFX_BitmapStorer::~CFX_BitmapStorer()
 {
-    if (m_pBitmap) {
-        delete m_pBitmap;
-    }
+    delete m_pBitmap;
 }
 CFX_DIBitmap* CFX_BitmapStorer::Detach()
 {
     CFX_DIBitmap* pBitmap = m_pBitmap;
     m_pBitmap = NULL;
     return pBitmap;
 }
 void CFX_BitmapStorer::Replace(CFX_DIBitmap* pBitmap)
 {
-    if (m_pBitmap) {
-        delete m_pBitmap;
-    }
+    delete m_pBitmap;
     m_pBitmap = pBitmap;
 }
 void CFX_BitmapStorer::ComposeScanline(int line, const uint8_t* scanline, const uint8_t* scan_extra_alpha)
 {
     uint8_t* dest_buf = (uint8_t*)m_pBitmap->GetScanline(line);
     uint8_t* dest_alpha_buf = m_pBitmap->m_pAlphaMask ?
                                (uint8_t*)m_pBitmap->m_pAlphaMask->GetScanline(line) : NULL;
     if (dest_buf) {
         FXSYS_memcpy(dest_buf, scanline, m_pBitmap->GetPitch());
     }
     if (dest_alpha_buf) {
         FXSYS_memcpy(dest_alpha_buf, scan_extra_alpha, m_pBitmap->m_pAlphaMask->GetPitch());
     }
 }
 FX_BOOL CFX_BitmapStorer::SetInfo(int width, int height, FXDIB_Format src_format, FX_DWORD* pSrcPalette)
 {
     m_pBitmap = new CFX_DIBitmap;
     if (!m_pBitmap->Create(width, height, src_format)) {
         delete m_pBitmap;
         m_pBitmap = NULL;
         return FALSE;
     }
     if (pSrcPalette) {
         m_pBitmap->CopyPalette(pSrcPalette);
     }
     return TRUE;
 }