summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2018-08-17 15:36:37 +0200
committerMichael BrĂ¼ning <michael.bruning@qt.io>2018-08-20 09:23:59 +0000
commitcf51b514c7debe6260581b237818a62f75684d67 (patch)
tree75a3a09c53f492be52f8ce38cc497d80ac38aa90
parent009019152edb1aace33472a6858fe39f9b44b67b (diff)
[Backport] Security Bug 840695
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 <michael.bruning@qt.io>
-rw-r--r--chromium/third_party/pdfium/core/fpdfapi/render/cpdf_dibsource.cpp1
1 files changed, 0 insertions, 1 deletions
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();