diff options
| -rw-r--r-- | core/fxcodec/codec/ccodec_jpegmodule.h | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_jpeg.cpp | 8 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_progress.cpp | 13 |
3 files changed, 17 insertions, 6 deletions
diff --git a/core/fxcodec/codec/ccodec_jpegmodule.h b/core/fxcodec/codec/ccodec_jpegmodule.h index 9f4c80d08d..aed01bda9b 100644 --- a/core/fxcodec/codec/ccodec_jpegmodule.h +++ b/core/fxcodec/codec/ccodec_jpegmodule.h @@ -7,6 +7,7 @@ #ifndef CORE_FXCODEC_CODEC_CCODEC_JPEGMODULE_H_ #define CORE_FXCODEC_CODEC_CCODEC_JPEGMODULE_H_ +#include <csetjmp> #include <memory> #include "core/fxcrt/fx_system.h" @@ -24,6 +25,7 @@ class CCodec_JpegModule { class Context { public: virtual ~Context() {} + virtual jmp_buf* GetJumpMark() = 0; }; std::unique_ptr<CCodec_ScanlineDecoder> CreateDecoder(const uint8_t* src_buf, diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp index 5b3c25d0f7..4d4adfd817 100644 --- a/core/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/fxcodec/codec/fx_codec_jpeg.cpp @@ -34,6 +34,8 @@ class CJpegContext : public CCodec_JpegModule::Context { CJpegContext(); ~CJpegContext() override; + jmp_buf* GetJumpMark() override { return &m_JumpMark; } + jmp_buf m_JumpMark; jpeg_decompress_struct m_Info; jpeg_error_mgr m_ErrMgr; @@ -476,11 +478,11 @@ int CCodec_JpegModule::ReadHeader(Context* pContext, } bool CCodec_JpegModule::StartScanline(Context* pContext, int down_scale) { - auto* ctx = static_cast<CJpegContext*>(pContext); - if (setjmp(ctx->m_JumpMark) == -1) + if (down_scale < 0) return false; - ctx->m_Info.scale_denom = down_scale; + auto* ctx = static_cast<CJpegContext*>(pContext); + ctx->m_Info.scale_denom = static_cast<unsigned int>(down_scale); return !!jpeg_start_decompress(&ctx->m_Info); } diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp index ea9cdd2ea9..c9436186ab 100644 --- a/core/fxcodec/codec/fx_codec_progress.cpp +++ b/core/fxcodec/codec/fx_codec_progress.cpp @@ -1869,10 +1869,15 @@ FXCODEC_STATUS CCodec_ProgressiveDecoder::StartDecode( case FXCODEC_IMAGE_JPG: { int down_scale = 1; GetDownScale(down_scale); + // Setting jump marker before calling StartScanLine, since a longjmp to + // the marker indicates a fatal error. + if (setjmp(*m_pJpegContext->GetJumpMark()) == -1) + return FXCODEC_STATUS_ERROR; + CCodec_JpegModule* pJpegModule = m_pCodecMgr->GetJpegModule(); - bool bStart = + bool startStatus = pJpegModule->StartScanline(m_pJpegContext.get(), down_scale); - while (!bStart) { + while (!startStatus) { FXCODEC_STATUS error_status = FXCODEC_STATUS_ERROR; if (!JpegReadMoreData(pJpegModule, error_status)) { m_pDeviceBitmap = nullptr; @@ -1880,7 +1885,9 @@ FXCODEC_STATUS CCodec_ProgressiveDecoder::StartDecode( m_status = error_status; return m_status; } - bStart = pJpegModule->StartScanline(m_pJpegContext.get(), down_scale); + + startStatus = + pJpegModule->StartScanline(m_pJpegContext.get(), down_scale); } int scanline_size = (m_SrcWidth + down_scale - 1) / down_scale; scanline_size = (scanline_size * m_SrcComponents + 3) / 4 * 4; |