diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-05-02 14:33:54 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-02 14:33:54 +0000 |
| commit | 28cad1534619d55820593baed0b6d6f3cbf767eb (patch) | |
| tree | 365208753d9b2957c5b091165c03c01478bb9436 /core/fxcodec/jbig2/JBig2_TrdProc.cpp | |
| parent | e77cccd4fe7e5b6707370ea7b67e6e303fe2764b (diff) | |
| download | pdfium-28cad1534619d55820593baed0b6d6f3cbf767eb.tar.xz | |
Make several Huffman decoders consistently check for integer overflows.
BUG=chromium:837972
Change-Id: I6cfa28bff38870419e4b1e2bced427cfcbf843cd
Reviewed-on: https://pdfium-review.googlesource.com/31912
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_TrdProc.cpp')
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_TrdProc.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/fxcodec/jbig2/JBig2_TrdProc.cpp b/core/fxcodec/jbig2/JBig2_TrdProc.cpp index b59f63bab4..ff94309bc4 100644 --- a/core/fxcodec/jbig2/JBig2_TrdProc.cpp +++ b/core/fxcodec/jbig2/JBig2_TrdProc.cpp @@ -12,6 +12,7 @@ #include "core/fxcodec/jbig2/JBig2_ArithIntDecoder.h" #include "core/fxcodec/jbig2/JBig2_GrrdProc.h" #include "core/fxcodec/jbig2/JBig2_HuffmanDecoder.h" +#include "core/fxcrt/fx_safe_types.h" #include "core/fxcrt/maybe_owned.h" #include "third_party/base/ptr_util.h" @@ -81,7 +82,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_TRDProc::DecodeHuffman( return nullptr; int32_t TI = SAFE_TI.ValueOrDie(); - pdfium::base::CheckedNumeric<int32_t> nVal = 0; + FX_SAFE_INT32 nSafeVal = 0; int32_t nBits = 0; uint32_t IDI; for (;;) { @@ -89,17 +90,16 @@ std::unique_ptr<CJBig2_Image> CJBig2_TRDProc::DecodeHuffman( if (pStream->read1Bit(&nTmp) != 0) return nullptr; - nVal <<= 1; - if (!nVal.IsValid()) + nSafeVal <<= 1; + if (!nSafeVal.IsValid()) return nullptr; - nVal |= nTmp; + nSafeVal |= nTmp; ++nBits; + const int32_t nVal = nSafeVal.ValueOrDie(); for (IDI = 0; IDI < SBNUMSYMS; ++IDI) { - if ((nBits == SBSYMCODES[IDI].codelen) && - (nVal.ValueOrDie() == SBSYMCODES[IDI].code)) { + if (nBits == SBSYMCODES[IDI].codelen && nVal == SBSYMCODES[IDI].code) break; - } } if (IDI < SBNUMSYMS) break; |