summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-05-30 13:07:20 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-05-30 20:22:28 +0000
commit2c200030b55faebbea7d7b30aba7ff7c5791b699 (patch)
treec0c010e554c282b725dfba0b63fd34e986824f1c
parent0704e9b8772e89290fa262a044ea0f6db4a58641 (diff)
downloadpdfium-chromium/3116.tar.xz
Fix small ordering issue in CFX_ProgressiveDecoder cleanup.chromium/3116
Ensure the renderstatus and image renderers are gone before trying to reset the device. Bug: 726755 Change-Id: Id69402a90aaf6eb03f9e3e7e51ad2f735ddb92d0 Reviewed-on: https://pdfium-review.googlesource.com/6081 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
-rw-r--r--core/fpdfapi/render/cpdf_progressiverenderer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.cpp b/core/fpdfapi/render/cpdf_progressiverenderer.cpp
index 4505db6874..984ad75834 100644
--- a/core/fpdfapi/render/cpdf_progressiverenderer.cpp
+++ b/core/fpdfapi/render/cpdf_progressiverenderer.cpp
@@ -28,8 +28,10 @@ CPDF_ProgressiveRenderer::CPDF_ProgressiveRenderer(
m_pCurrentLayer(nullptr) {}
CPDF_ProgressiveRenderer::~CPDF_ProgressiveRenderer() {
- if (m_pRenderStatus)
+ if (m_pRenderStatus) {
+ m_pRenderStatus.reset(); // Release first.
m_pDevice->RestoreState(false);
+ }
}
void CPDF_ProgressiveRenderer::Start(IFX_Pause* pPause) {