diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-24 11:47:24 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-24 11:47:24 -0800 |
| commit | b599f192d635d97a2f41e8ffc9784e5291b11caf (patch) | |
| tree | d324317c0c826757a715a0b45c61aa82a24f019c /core/src/fxcodec/jbig2/JBig2_SddProc.cpp | |
| parent | 5259ef39ae47831a3533f475234b30f22a2ca849 (diff) | |
| download | pdfium-b599f192d635d97a2f41e8ffc9784e5291b11caf.tar.xz | |
Merge to XFA: Fix a NULL pointer crash in the CJBig2_Image copy constructor.
Also change the copy ctor to take a const ref.
BUG=560520
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1472113002 .
(cherry picked from commit d03bc01003ae2603dafdc07b901ffef0a509a2b9)
Review URL: https://codereview.chromium.org/1478473002 .
Diffstat (limited to 'core/src/fxcodec/jbig2/JBig2_SddProc.cpp')
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_SddProc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp b/core/src/fxcodec/jbig2/JBig2_SddProc.cpp index 52aef2b37f..edfc074003 100644 --- a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_SddProc.cpp @@ -266,7 +266,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith( for (I = 0; I < SDNUMINSYMS + SDNUMNEWSYMS; I++) { if (EXFLAGS[I] && J < SDNUMEXSYMS) { if (I < SDNUMINSYMS) { - pDict->AddImage(new CJBig2_Image(*SDINSYMS[I])); + pDict->AddImage(SDINSYMS[I] ? new CJBig2_Image(*SDINSYMS[I]) : nullptr); } else { pDict->AddImage(SDNEWSYMS[I - SDNUMINSYMS]); } @@ -604,7 +604,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman( for (I = 0; I < SDNUMINSYMS + SDNUMNEWSYMS; I++) { if (EXFLAGS[I] && J < SDNUMEXSYMS) { if (I < SDNUMINSYMS) { - pDict->AddImage(new CJBig2_Image(*SDINSYMS[I])); + pDict->AddImage(SDINSYMS[I] ? new CJBig2_Image(*SDINSYMS[I]) : nullptr); } else { pDict->AddImage(SDNEWSYMS[I - SDNUMINSYMS]); } |