projects
/
pdfium.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
659b8d3
)
Merge to XFA: Check for NULL pointers in CJBig2_SymbolDict::DeepCopy().
author
Lei Zhang
<thestig@chromium.org>
Sat, 28 Feb 2015 03:51:26 +0000 (19:51 -0800)
committer
Lei Zhang
<thestig@chromium.org>
Sat, 28 Feb 2015 03:51:26 +0000 (19:51 -0800)
Original URL: https://codereview.chromium.org/
837093002
(cherry picked from commit
f8105c665856863ad95da37fee6c12b98b953e2c
)
Review URL: https://codereview.chromium.org/
967033002
core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
patch
|
blob
|
history
diff --git
a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
index
bad2fc4
..
e9bb9c6
100644
(file)
--- 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;
}