Don't bother checking pointers before delete[] and FX_Free().

core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.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/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "pageint.h"
@@ skipping 421 matching lines @@
         ((CPDF_Array*)pFilter)->RemoveAt(0);
         CPDF_Array* pParams = pDict->GetArray(FX_BSTRC("DecodeParms"));
         if (pParams) {
           pParams->RemoveAt(0);
         }
       } else {
         pDict->RemoveAt(FX_BSTRC("Filter"));
         pDict->RemoveAt(FX_BSTRC("DecodeParms"));
       }
     } else {
-      if (pData) {
         FX_Free(pData);
-      }
       FX_DWORD dwSavePos = m_Pos;
       m_Pos += dwStreamSize;
       while (1) {
         FX_DWORD dwPrevPos = m_Pos;
         CPDF_StreamParser::SyntaxType type = ParseNextElement();
         if (type == CPDF_StreamParser::EndOfData) {
           break;
         }
         if (type != CPDF_StreamParser::Keyword) {
           dwStreamSize += m_Pos - dwPrevPos;
@@ skipping 498 matching lines @@
   Clear();
 }
 void CPDF_ContentParser::Clear() {
   delete m_pParser;
   delete m_pSingleStream;
   if (m_pStreamArray) {
     for (FX_DWORD i = 0; i < m_nStreams; i++)
       delete m_pStreamArray[i];
     FX_Free(m_pStreamArray);
   }
-  if (m_pData && m_pSingleStream == NULL) {
+  if (!m_pSingleStream)
     FX_Free((void*)m_pData);

[Tom Sepez, 2015/08/14 21:21:34]

nit: void cast not needed?

[Lei Zhang, 2015/08/14 21:43:15]

Done.

-  }
   m_pParser = NULL;
   m_pStreamArray = NULL;
   m_pSingleStream = NULL;
   m_pData = NULL;
   m_Status = Ready;
 }
 void CPDF_ContentParser::Start(CPDF_Page* pPage, CPDF_ParseOptions* pOptions) {
   if (m_Status != Ready || pPage == NULL || pPage->m_pDocument == NULL ||
       pPage->m_pFormDict == NULL) {
     m_Status = Done;
@@ skipping 200 matching lines @@
       }
       m_Status = Done;
       return;
     }
     steps++;
     if (pPause && pPause->NeedToPauseNow()) {
       break;
     }
   }
 }