diff options
| -rw-r--r-- | core/fpdfapi/page/cpdf_docpagedata.cpp | 19 | ||||
| -rw-r--r-- | core/fpdfapi/page/cpdf_shadingobject.cpp | 1 |
2 files changed, 16 insertions, 4 deletions
diff --git a/core/fpdfapi/page/cpdf_docpagedata.cpp b/core/fpdfapi/page/cpdf_docpagedata.cpp index 4438006ab3..71143d0b6c 100644 --- a/core/fpdfapi/page/cpdf_docpagedata.cpp +++ b/core/fpdfapi/page/cpdf_docpagedata.cpp @@ -52,11 +52,26 @@ CPDF_DocPageData::~CPDF_DocPageData() { void CPDF_DocPageData::Clear(bool bForceRelease) { m_bForceClear = bForceRelease; + // This is needed because if |bForceRelease| is true we will destroy any + // pattern we see regardless of the ref-count. The tiling pattern owns a + // Form object which owns a ShadingObject. The ShadingObject has an unowned + // pointer to a ShadingPattern. The ShadingPattern is owned by the + // DocPageData. So, we loop through and clear any tiling patterns before we + // do the same for any shading patterns, otherwise we may free the + // ShadingPattern before the ShadingObject and trigger an unowned pointer + // probe warning. for (auto& it : m_PatternMap) { CPDF_CountedPattern* ptData = it.second; - if (!ptData->get()) + if (!ptData->get() || !ptData->get()->AsTilingPattern()) continue; + if (bForceRelease || ptData->use_count() < 2) + ptData->clear(); + } + for (auto& it : m_PatternMap) { + CPDF_CountedPattern* ptData = it.second; + if (!ptData->get()) + continue; if (bForceRelease || ptData->use_count() < 2) ptData->clear(); } @@ -65,7 +80,6 @@ void CPDF_DocPageData::Clear(bool bForceRelease) { CPDF_CountedFont* fontData = it.second; if (!fontData->get()) continue; - if (bForceRelease || fontData->use_count() < 2) { fontData->clear(); } @@ -75,7 +89,6 @@ void CPDF_DocPageData::Clear(bool bForceRelease) { CPDF_CountedColorSpace* csData = it.second; if (!csData->get()) continue; - if (bForceRelease || csData->use_count() < 2) { csData->get()->Release(); csData->reset(nullptr); diff --git a/core/fpdfapi/page/cpdf_shadingobject.cpp b/core/fpdfapi/page/cpdf_shadingobject.cpp index 5454380cae..8a61161f17 100644 --- a/core/fpdfapi/page/cpdf_shadingobject.cpp +++ b/core/fpdfapi/page/cpdf_shadingobject.cpp @@ -6,7 +6,6 @@ #include "core/fpdfapi/page/cpdf_shadingobject.h" -#include "core/fpdfapi/page/cpdf_docpagedata.h" #include "core/fpdfapi/page/cpdf_shadingpattern.h" #include "core/fpdfapi/parser/cpdf_document.h" |