summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2018-01-19 20:04:38 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-01-19 20:04:38 +0000
commit5ca283f376816522065c0ea35644fcb684f9572f (patch)
tree519d20cfa45e46583d5f8c831b0e7dbb10aa3ba2
parentebf965adeb93cf5612291ae69c3986526394b354 (diff)
downloadpdfium-chromium/3328.tar.xz
Remove code added in by a bad rebase or mergechromium/3328chromium/3327chromium/3326
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 <hnakashima@chromium.org> Commit-Queue: Ryan Harrison <rharrison@chromium.org>
-rw-r--r--core/fxcodec/codec/fx_codec_progress.cpp7
1 files changed, 0 insertions, 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;