diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-07-16 18:45:22 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-07-16 18:45:22 -0700 |
| commit | 796c908e7b7bdde819a1e5a4bfd3576d8e8859d6 (patch) | |
| tree | 8c0cd763dd9bf70bc14da8f8cb7893835a3572fe /core/src/fxcodec/jbig2 | |
| parent | ba026913c273a5c1c841bced288fdab03f10ad08 (diff) | |
| download | pdfium-796c908e7b7bdde819a1e5a4bfd3576d8e8859d6.tar.xz | |
Merge to XFA: Cleanup: Do not check pointers before deleting them, part 2.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1195363002 .
(cherry picked from commit 21bf242a31eff79f754c5e9c3b41c52e33483bb0)
Review URL: https://codereview.chromium.org/1235753006 .
Diffstat (limited to 'core/src/fxcodec/jbig2')
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp index 929180e0b5..622f04b160 100644 --- a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp @@ -3027,9 +3027,7 @@ CJBig2_SymbolDict *CJBig2_SDDProc::decode_Huffman(CJBig2_BitStream *pStream, 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) { @@ -3094,15 +3092,11 @@ CJBig2_Image *CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder, } } 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; |