Cleanup: Do not check pointers before deleting them.

core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.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 <utility>
 #include <vector>
 
 #include "../../../include/fpdfapi/fpdf_module.h"
@@ skipping 50 matching lines @@
     FX_DWORD dwSize = m_CrossRef.GetSize();
     return dwSize ? dwSize - 1 : 0;
 }
 void CPDF_Parser::SetEncryptDictionary(CPDF_Dictionary* pDict)
 {
     m_pEncryptDict = pDict;
 }
 void CPDF_Parser::CloseParser(FX_BOOL bReParse)
 {
     m_bVersionUpdated = FALSE;
-    if (m_pDocument && !bReParse) {
+    if (!bReParse) {
         delete m_pDocument;
         m_pDocument = NULL;
     }
     if (m_pTrailer) {
         m_pTrailer->Release();
         m_pTrailer = NULL;
     }
     ReleaseEncryptHandler();
     SetEncryptDictionary(NULL);
     if (m_bOwnFileRead && m_Syntax.m_pFileAccess) {
@@ skipping 220 matching lines @@
             delete pCryptoHandler;
             pCryptoHandler = NULL;
             return PDFPARSE_ERROR_HANDLER;
         }
         m_Syntax.SetEncrypt(pCryptoHandler);
     }
     return PDFPARSE_ERROR_SUCCESS;
 }
 void CPDF_Parser::ReleaseEncryptHandler()
 {
-    if (m_Syntax.m_pCryptoHandler) {
-        delete m_Syntax.m_pCryptoHandler;
-        m_Syntax.m_pCryptoHandler = NULL;
-    }
-    if (m_pSecurityHandler && !m_bForceUseSecurityHandler) {
-        delete m_pSecurityHandler;
-        m_pSecurityHandler = NULL;
-    }
+    delete m_Syntax.m_pCryptoHandler;
+    m_Syntax.m_pCryptoHandler = NULL;
+    delete m_pSecurityHandler;
+    m_pSecurityHandler = NULL;

[Tom Sepez, 2015/06/19 21:13:37]

still need to check !m_bForceUseSecurityHandler

[Lei Zhang, 2015/06/19 21:30:37]

Done.

 }
 FX_FILESIZE CPDF_Parser::GetObjectOffset(FX_DWORD objnum)
 {
     if (objnum >= (FX_DWORD)m_CrossRef.GetSize()) {
         return 0;
     }
     if (m_V5Type[objnum] == 1) {
         return m_CrossRef[objnum];
     }
     if (m_V5Type[objnum] == 2) {
@@ skipping 1145 matching lines @@
     }
     return dwPermission;
 }
 FX_BOOL CPDF_Parser::IsOwner()
 {
     return m_pSecurityHandler == NULL ? TRUE : m_pSecurityHandler->IsOwner();
 }
 void CPDF_Parser::SetSecurityHandler(CPDF_SecurityHandler* pSecurityHandler, FX_BOOL bForced)
 {
     ASSERT(m_pSecurityHandler == NULL);
-    if (m_pSecurityHandler && !m_bForceUseSecurityHandler) {
-        delete m_pSecurityHandler;
-        m_pSecurityHandler = NULL;
-    }
+    delete m_pSecurityHandler;

[Tom Sepez, 2015/06/19 21:13:37]

same here.

[Lei Zhang, 2015/06/19 21:30:37]

Done. I'm going to look the other way and prevent line 1480 isn't there for now.

+    m_pSecurityHandler = NULL;
     m_bForceUseSecurityHandler = bForced;
     m_pSecurityHandler = pSecurityHandler;
     if (m_bForceUseSecurityHandler) {
         return;
     }
     m_Syntax.m_pCryptoHandler = pSecurityHandler->CreateCryptoHandler();
     m_Syntax.m_pCryptoHandler->Init(NULL, pSecurityHandler);
 }
 FX_BOOL CPDF_Parser::IsLinearizedFile(IFX_FileRead* pFileAccess, FX_DWORD offset)
 {
@@ skipping 1478 matching lines @@
 {
     if (m_pLinearized)  {
         m_pLinearized->Release();
     }
     if (m_pRoot) {
         m_pRoot->Release();
     }
     if (m_pTrailer) {
         m_pTrailer->Release();
     }
-    if (m_pageMapCheckState) {
-        delete m_pageMapCheckState;
-    }
-    if (m_pagesLoadState) {
-        delete m_pagesLoadState;
-    }
+    delete m_pageMapCheckState;
+    delete m_pagesLoadState;
     int32_t i = 0;
     int32_t iSize = m_arrayAcroforms.GetSize();
     for (i = 0; i < iSize; ++i) {
         ((CPDF_Object *)m_arrayAcroforms.GetAt(i))->Release();
     }
 }
 void CPDF_DataAvail::SetDocument(CPDF_Document* pDoc)
 {
     m_pDocument = pDoc;
 }
@@ skipping 1630 matching lines @@
             iLow = iMid + 1;
         }
     }
     iNext = iLow;
     return FALSE;
 }
 CPDF_PageNode::~CPDF_PageNode()
 {
     int32_t iSize = m_childNode.GetSize();
     for (int32_t i = 0; i < iSize; ++i) {
-        CPDF_PageNode *pNode = (CPDF_PageNode*)m_childNode[i];
-        if (pNode) {
-            delete pNode;
-        }
+        CPDF_PageNode* pNode = (CPDF_PageNode*)m_childNode[i];
+        delete pNode;
     }
     m_childNode.RemoveAll();
 }