Cleanup: Do not check pointers before deleting them.

fpdfsdk/src/fsdk_mgr.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 "../../public/fpdf_ext.h"
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/formfiller/FFL_FormFiller.h"
@@ skipping 221 matching lines @@
         m_pSysHandler = new CFX_SystemHandler(this);
 
 
         m_pJSRuntimeFactory = NULL;
         m_pJSRuntimeFactory = GetJSRuntimeFactory();
         m_pJSRuntimeFactory->AddRef();
 }
 
 CPDFDoc_Environment::~CPDFDoc_Environment()
 {
+    delete m_pIFormFiller;
+    m_pIFormFiller = NULL;
+    if (m_pJSRuntime && m_pJSRuntimeFactory)
+        m_pJSRuntimeFactory->DeleteJSRuntime(m_pJSRuntime);
+    m_pJSRuntimeFactory->Release();
 
-        if ( m_pIFormFiller )
-        {
-                delete m_pIFormFiller;
-                m_pIFormFiller = NULL;
-        }
-        if(m_pJSRuntime && m_pJSRuntimeFactory)
-                m_pJSRuntimeFactory->DeleteJSRuntime(m_pJSRuntime);
-        m_pJSRuntimeFactory->Release();
+    delete m_pSysHandler;
+    m_pSysHandler = NULL;
 
-        if(m_pSysHandler)
-        {
-                delete m_pSysHandler;
-                m_pSysHandler = NULL;
-        }
-
-        if(m_pAnnotHandlerMgr)
-        {
-                delete m_pAnnotHandlerMgr;
-                m_pAnnotHandlerMgr = NULL;
-        }
-        if(m_pActionHandler)
-        {
-                delete m_pActionHandler;
-                m_pActionHandler = NULL;
-        }
-
-
+    delete m_pAnnotHandlerMgr;
+    m_pAnnotHandlerMgr = NULL;
+    delete m_pActionHandler;
+    m_pActionHandler = NULL;
 }
 
 
 IFXJS_Runtime* CPDFDoc_Environment::GetJSRuntime()
 {
         if(!IsJSInitiated())
                 return NULL;
         assert(m_pJSRuntimeFactory);
         if(!m_pJSRuntime)
                 m_pJSRuntime = m_pJSRuntimeFactory->NewJSRuntime(this);
@@ skipping 352 matching lines @@
         {
                 CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i);
                 //if there is a focused annot on the page, we should kill the focus first.
                 if(pAnnot == m_pSDKDoc->GetFocusAnnot())
                         KillFocusAnnot();
                 CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr();
                 ASSERT(pAnnotHandlerMgr);
                 pAnnotHandlerMgr->ReleaseAnnot(pAnnot);
         }
         m_fxAnnotArray.RemoveAll();
-        if(m_pAnnotList)
-        {
-                delete m_pAnnotList;
-                m_pAnnotList = NULL;
-        }
+
+        delete m_pAnnotList;
+        m_pAnnotList = NULL;
+
         m_page->RemovePrivateData((void*)m_page);
         if(m_bTakeOverPage) {
             delete m_page;
         }
 }
 
 void CPDFSDK_PageView::PageView_OnDraw(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,CPDF_RenderOptions* pOptions)
 {
     m_curMatrix = *pUser2Device;
 
@@ skipping 398 matching lines @@
 
         for(int i=0; i<m_fxAnnotArray.GetSize(); i++)
         {
                 CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i);
                 if(pAnnot == pFocusAnnot)
                         return pAnnot;
         }
         return NULL;
 }