From a3cf977f974c67bd2cef8dee5b810784bfc21336 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 16 May 2017 15:57:26 -0700 Subject: CFX_UnownedPtr: check during assignment time as well. In particular, doing m_pPtr = nullptr; in your dtor to evade this check will not longer work. Fix slight mis-ordering observeds in CFX_Font and CPDFXFA_Context. Change-Id: I3e6137159430333b091364021283a54a13d916b5 Reviewed-on: https://pdfium-review.googlesource.com/5570 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fxge/ge/cfx_font.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/fxge') diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp index 18baed9d09..1a45fd3f5b 100644 --- a/core/fxge/ge/cfx_font.cpp +++ b/core/fxge/ge/cfx_font.cpp @@ -545,8 +545,9 @@ CFX_FaceCache* CFX_Font::GetFaceCache() const { void CFX_Font::ClearFaceCache() { if (!m_FaceCache) return; - CFX_GEModule::Get()->GetFontCache()->ReleaseCachedFace(this); + m_FaceCache = nullptr; + CFX_GEModule::Get()->GetFontCache()->ReleaseCachedFace(this); } int CFX_Font::GetULPos() const { -- cgit v1.2.3