diff options
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_ArithDecoder.cpp | 8 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_ArithDecoder.h | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp b/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp index 45628a87ce..deba72bfc5 100644 --- a/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp +++ b/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp @@ -56,7 +56,7 @@ int DecodeNLPS(JBig2ArithCtx* pCX, const JBig2ArithQe& qe) { } // namespace CJBig2_ArithDecoder::CJBig2_ArithDecoder(CJBig2_BitStream* pStream) - : m_Complete(false), m_pStream(pStream) { + : m_Complete(false), m_FinishedStream(false), m_pStream(pStream) { m_B = m_pStream->getCurByte_arith(); m_C = (m_B ^ 0xff) << 16; BYTEIN(); @@ -95,6 +95,12 @@ void CJBig2_ArithDecoder::BYTEIN() { B1 = m_pStream->getNextByte_arith(); if (B1 > 0x8f) { m_CT = 8; + // If we are here, it means that we have finished decoding data (see JBIG2 + // spec, Section E.3.4). If we arrive here a second time, we're looping, + // so complete decoding. + if (m_FinishedStream) + m_Complete = true; + m_FinishedStream = true; } else { m_pStream->incByteIdx(); m_B = B1; diff --git a/core/fxcodec/jbig2/JBig2_ArithDecoder.h b/core/fxcodec/jbig2/JBig2_ArithDecoder.h index d4a2daedbc..c9e29a5937 100644 --- a/core/fxcodec/jbig2/JBig2_ArithDecoder.h +++ b/core/fxcodec/jbig2/JBig2_ArithDecoder.h @@ -35,6 +35,7 @@ class CJBig2_ArithDecoder { void ReadValueA(); bool m_Complete; + bool m_FinishedStream; uint8_t m_B; unsigned int m_C; unsigned int m_A; |