summaryrefslogtreecommitdiff
path: root/core/fxcodec/codec/fx_codec_progress.cpp
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-05-12 14:36:06 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-05-12 18:56:06 +0000
commitef73cf5838ab3a902872d9fc57a90621cc3d7f21 (patch)
treeeed3efc2f90742ea509b39ab529f23f8c77b8443 /core/fxcodec/codec/fx_codec_progress.cpp
parent2199ab8e048ae19ee3ae01afe640ce3a66092a00 (diff)
downloadpdfium-ef73cf5838ab3a902872d9fc57a90621cc3d7f21.tar.xz
Rename ErrorData and fix potential leakchromium/3100chromium/3099
This CL fixes a leak that can be caused by a longjmp in ErrorData. The method is renamed to express the fact that it includes such, and a followup should remove the jmps altogether. Bug: chromium:721488 Change-Id: Iefcc82a77a30ff77b7973b05611440a8d5bf275e Reviewed-on: https://pdfium-review.googlesource.com/5450 Commit-Queue: Nicolás Peña <npm@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/fx_codec_progress.cpp')
-rw-r--r--core/fxcodec/codec/fx_codec_progress.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp
index aa97ac4bb2..4cbae5cc75 100644
--- a/core/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/fxcodec/codec/fx_codec_progress.cpp
@@ -1804,8 +1804,7 @@ FXCODEC_STATUS CCodec_ProgressiveDecoder::GetFrames(int32_t& frames) {
m_status = FXCODEC_STATUS_DECODE_READY;
return m_status;
}
- if (m_pGifContext.get())
- m_pGifContext = nullptr;
+ m_pGifContext = nullptr;
m_status = FXCODEC_STATUS_ERROR;
return m_status;
}