From cfac954abcab7caf47d3fa3d641c553cba998271 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Fri, 19 Jun 2015 14:51:10 -0700
Subject: Cleanup: Do not check pointers before deleting them.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1192743004.
---
 core/src/fpdfdoc/doc_vt.cpp |  6 ++----
 core/src/fpdfdoc/pdf_vt.h   | 12 +++---------
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'core/src/fpdfdoc')

diff --git a/core/src/fpdfdoc/doc_vt.cpp b/core/src/fpdfdoc/doc_vt.cpp
index fd3cbb058c..c6fdf0e3e7 100644
--- a/core/src/fpdfdoc/doc_vt.cpp
+++ b/core/src/fpdfdoc/doc_vt.cpp
@@ -822,10 +822,8 @@ CPDF_VariableText::CPDF_VariableText() :
 }
 CPDF_VariableText::~CPDF_VariableText()
 {
-    if (m_pVTIterator) {
-        delete m_pVTIterator;
-        m_pVTIterator = NULL;
-    }
+    delete m_pVTIterator;
+    m_pVTIterator = NULL;
     ResetAll();
 }
 void CPDF_VariableText::Initialize()
diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h
index 5acab96fbd..a75490fcd5 100644
--- a/core/src/fpdfdoc/pdf_vt.h
+++ b/core/src/fpdfdoc/pdf_vt.h
@@ -84,12 +84,8 @@ struct CPVT_SectionInfo {
     }
     virtual ~CPVT_SectionInfo()
     {
-        if (pSecProps) {
-            delete pSecProps;
-        }
-        if (pWordProps) {
-            delete pWordProps;
-        }
+        delete pSecProps;
+        delete pWordProps;
     }
     CPVT_SectionInfo(const CPVT_SectionInfo & other): rcSection(), nTotalLine(0), pSecProps(NULL), pWordProps(NULL)
     {
@@ -148,9 +144,7 @@ struct CPVT_WordInfo  {
     }
     virtual ~CPVT_WordInfo()
     {
-        if (pWordProps) {
-            delete pWordProps;
-        }
+        delete pWordProps;
     }
     CPVT_WordInfo(const CPVT_WordInfo & word): Word(0), nCharset(0),
         fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f), nFontIndex(-1), pWordProps(NULL)
-- 
cgit v1.2.3