From 5ca283f376816522065c0ea35644fcb684f9572f Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Fri, 19 Jan 2018 20:04:38 +0000 Subject: Remove code added in by a bad rebase or merge The guard being removed was moved lower down in the code, but it appears the original creeped back in while I was rebasing at some point. This is causing clusterfuzz failures. BUG=chromium:803732,chromium:803735 Change-Id: I5bcc6046e64d6060a674f390e243dd8eda9d1d17 Reviewed-on: https://pdfium-review.googlesource.com/23250 Reviewed-by: Henrique Nakashima Commit-Queue: Ryan Harrison --- core/fxcodec/codec/fx_codec_progress.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp index eb0ecc9d87..82b0168f6e 100644 --- a/core/fxcodec/codec/fx_codec_progress.cpp +++ b/core/fxcodec/codec/fx_codec_progress.cpp @@ -1112,13 +1112,6 @@ bool CCodec_ProgressiveDecoder::JpegDetectImageType( CFX_DIBAttribute* pAttribute, uint32_t size) { CCodec_JpegModule* pJpegModule = m_pCodecMgr->GetJpegModule(); - // Setting jump marker before calling Start or ReadHeader, since a longjmp - // to the marker indicates a fatal error in these functions. - if (setjmp(*m_pJpegContext->GetJumpMark()) == -1) { - m_status = FXCODEC_STATUS_ERROR; - return false; - } - m_pJpegContext = pJpegModule->Start(); if (!m_pJpegContext) { m_status = FXCODEC_STATUS_ERR_MEMORY; -- cgit v1.2.3