From cf51b514c7debe6260581b237818a62f75684d67 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 17 Aug 2018 15:36:37 +0200 Subject: [Backport] Security Bug 840695 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix destruction order in CPDF_Dibsource. The order of the elements in the header is correct, but we were clearing it early in the destructor itself. Bug: 840695 Reviewed-on: https://pdfium-review.googlesource.com/32311 Change-Id: I86e3b7ac5754dc6cb1f45c7dc46433d9a0a3906b Reviewed-by: Michael Brüning --- chromium/third_party/pdfium/core/fpdfapi/render/cpdf_dibsource.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/chromium/third_party/pdfium/core/fpdfapi/render/cpdf_dibsource.cpp b/chromium/third_party/pdfium/core/fpdfapi/render/cpdf_dibsource.cpp index c1b96073d94..45201be66aa 100644 --- a/chromium/third_party/pdfium/core/fpdfapi/render/cpdf_dibsource.cpp +++ b/chromium/third_party/pdfium/core/fpdfapi/render/cpdf_dibsource.cpp @@ -136,7 +136,6 @@ CPDF_DIBSource::CPDF_DIBSource() CPDF_DIBSource::~CPDF_DIBSource() { FX_Free(m_pMaskedLine); FX_Free(m_pLineBuf); - m_pCachedBitmap.Reset(); // TODO(tsepez): determine if required early here. FX_Free(m_pCompData); if (m_pColorSpace && m_pDocument) { auto* pPageData = m_pDocument->GetPageData(); -- cgit v1.2.1