Do not check pointers before deleting them.

xfa/fee/fde_txtedtpage.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 "xfa/fee/fde_txtedtpage.h"
 
 #include <algorithm>
 
@@ skipping 121 matching lines @@
       m_nCharCount(0),
       m_nPageIndex(nPageIndex),
       m_bLoaded(FALSE),
       m_pCharWidth(nullptr) {
   FXSYS_memset(&m_rtPage, 0, sizeof(CFX_RectF));
   FXSYS_memset(&m_rtPageMargin, 0, sizeof(CFX_RectF));
   FXSYS_memset(&m_rtPageContents, 0, sizeof(CFX_RectF));
   FXSYS_memset(&m_rtPageCanvas, 0, sizeof(CFX_RectF));
   m_pEditEngine = (CFDE_TxtEdtEngine*)pEngine;
 }
+
 CFDE_TxtEdtPage::~CFDE_TxtEdtPage() {
   m_PieceMassArr.RemoveAll(TRUE);
-  if (m_pTextSet) {
-    delete m_pTextSet;
-    m_pTextSet = NULL;
-  }
-  if (m_pCharWidth) {
-    delete[] m_pCharWidth;
-    m_pCharWidth = NULL;
-  }
-  if (m_pIter != NULL) {
+  delete m_pTextSet;
+  delete[] m_pCharWidth;
+  if (m_pIter)
     m_pIter->Release();
-    m_pIter = NULL;
-  }
 }
+
 void CFDE_TxtEdtPage::Release() {
   delete this;
 }
 IFDE_TxtEdtEngine* CFDE_TxtEdtPage::GetEngine() const {
   return (IFDE_TxtEdtEngine*)m_pEditEngine;
 }
 FDE_VISUALOBJTYPE CFDE_TxtEdtPage::GetType() {
   return FDE_VISUALOBJ_Text;
 }
 FX_BOOL CFDE_TxtEdtPage::GetBBox(FDE_HVISUALOBJ hVisualObj, CFX_RectF& bbox) {
@@ skipping 381 matching lines @@
     m_rtPageContents.height -= pParams->fLineSpace - pParams->fFontSize;
     int32_t nCount = m_PieceMassArr.GetSize();
     FDE_TEXTEDITPIECE* pPiece = m_PieceMassArr.GetPtrAt(nCount - 1);
     pPiece->rtPiece.height = pParams->fFontSize;
   }
   pIter->Release();
   m_nRefCount = 1;
   m_bLoaded = TRUE;
   return 0;
 }
+
 void CFDE_TxtEdtPage::UnloadPage(const CFX_RectF* pClipBox) {
   ASSERT(m_nRefCount > 0);
   m_nRefCount--;
-  if (m_nRefCount == 0) {
-    m_PieceMassArr.RemoveAll();
-    if (m_pTextSet) {
-      delete m_pTextSet;
-      m_pTextSet = NULL;
-    }
-    if (m_pCharWidth) {
-      delete[] m_pCharWidth;
-      m_pCharWidth = NULL;
-    }
-    if (m_pBgnParag) {
-      m_pBgnParag->UnloadParag();
-    }
-    if (m_pEndParag) {
-      m_pEndParag->UnloadParag();
-    }
-    if (m_pIter) {
-      m_pIter->Release();
-      m_pIter = NULL;
-    }
-    m_pBgnParag = NULL;
-    m_pEndParag = NULL;
+  if (m_nRefCount != 0)
+    return;
+
+  m_PieceMassArr.RemoveAll();
+  delete m_pTextSet;
+  m_pTextSet = nullptr;
+  delete[] m_pCharWidth;
+  m_pCharWidth = nullptr;
+  if (m_pBgnParag)
+    m_pBgnParag->UnloadParag();
+  if (m_pEndParag)
+    m_pEndParag->UnloadParag();
+  if (m_pIter) {
+    m_pIter->Release();
+    m_pIter = nullptr;
   }
+  m_pBgnParag = nullptr;
+  m_pEndParag = nullptr;
 }
 
 const CFX_RectF& CFDE_TxtEdtPage::GetContentsBox() {
   return m_rtPageContents;
 }
 FX_POSITION CFDE_TxtEdtPage::GetFirstPosition(FDE_HVISUALOBJ hCanvas) {
   if (m_PieceMassArr.GetSize() < 1) {
     return NULL;
   }
   return (FX_POSITION)1;
@@ skipping 43 matching lines @@
     ptF.x = rtF.left;
   } else if (ptF.x >= rtF.right()) {
     ptF.x = rtF.right() - fTolerance;
   }
   if (ptF.y < rtF.top) {
     ptF.y = rtF.top;
   } else if (ptF.y >= rtF.bottom()) {
     ptF.y = rtF.bottom() - fTolerance;
   }
 }