From f8105c665856863ad95da37fee6c12b98b953e2c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 9 Jan 2015 15:33:19 -0800 Subject: Check for NULL pointers in CJBig2_SymbolDict::DeepCopy(). BUG=445475 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/837093002 --- core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp index bad2fc4bce..e9bb9c62e0 100644 --- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp +++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp @@ -27,8 +27,12 @@ CJBig2_SymbolDict *CJBig2_SymbolDict::DeepCopy() dst->SDEXSYMS = (CJBig2_Image**)m_pModule->JBig2_Malloc2( sizeof(CJBig2_Image*), src->SDNUMEXSYMS); for(FX_DWORD i = 0; i < src->SDNUMEXSYMS; i++) { - JBIG2_ALLOC(dst->SDEXSYMS[i], - CJBig2_Image(*(src->SDEXSYMS[i]))); + if (src->SDEXSYMS[i]) { + JBIG2_ALLOC(dst->SDEXSYMS[i], + CJBig2_Image(*(src->SDEXSYMS[i]))); + } else { + dst->SDEXSYMS[i] = NULL; + } } return dst; } -- cgit v1.2.3