Merge to XFA: Cleanup: Do not check pointers before deleting them, part 2.

core/src/fxcodec/jbig2/JBig2_GeneralDecoder.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 "JBig2_GeneralDecoder.h"
 #include "JBig2_ArithDecoder.h"
 #include "JBig2_ArithIntDecoder.h"
 #include "JBig2_HuffmanDecoder.h"
@@ skipping 3009 matching lines @@
     }
     m_pModule->JBig2_Free(EXFLAGS);
     m_pModule->JBig2_Free(SDNEWSYMS);
     if(SDREFAGG == 0) {
         m_pModule->JBig2_Free(SDNEWSYMWIDTHS);
     }
     delete pHuffmanDecoder;
     return pDict;
 failed:
     for(I = 0; I < NSYMSDECODED; I++) {
-        if (SDNEWSYMS[I]) {
-            delete SDNEWSYMS[I];
-        }
+        delete SDNEWSYMS[I];
     }
     m_pModule->JBig2_Free(SDNEWSYMS);
     if(SDREFAGG == 0) {
         m_pModule->JBig2_Free(SDNEWSYMWIDTHS);
     }
     delete pHuffmanDecoder;
     return NULL;
 }
 CJBig2_Image *CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder,
         JBig2ArithCtx *gbContext, IFX_Pause* pPause)
@@ skipping 44 matching lines @@
             x = (HGX + mg * HRY + ng * HRX) >> 8;
             y = (HGY + mg * HRX - ng * HRY) >> 8;
             FX_DWORD pat_index = GI[mg * HGW + ng];
             if (pat_index >= HNUMPATS) {
                 pat_index = HNUMPATS - 1;
             }
             HTREG->composeFrom(x, y, HPATS[pat_index], HCOMBOP);
         }
     }
     m_pModule->JBig2_Free(GI);
-    if(HSKIP) {
-        delete HSKIP;
-    }
+    delete HSKIP;
     delete pGID;
     return HTREG;
 failed:
-    if(HSKIP) {
-        delete HSKIP;
-    }
+    delete HSKIP;
     delete pGID;
     delete HTREG;
     return NULL;
 }
 CJBig2_Image *CJBig2_HTRDProc::decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause)
 {
     FX_DWORD ng, mg;
     int32_t x, y;
     FX_DWORD HBPP;
     FX_DWORD *GI;
@@ skipping 1212 matching lines @@
         }
         if(pPause && pPause->NeedToPauseNow()) {
             m_loopIndex++;
             m_ProssiveStatus = FXCODEC_STATUS_DECODE_TOBECONTINUE;
             return FXCODEC_STATUS_DECODE_TOBECONTINUE;
         }
     }
     m_ProssiveStatus = FXCODEC_STATUS_DECODE_FINISH;
     return FXCODEC_STATUS_DECODE_FINISH;
 }