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 --- fpdfsdk/fpdfxfa/cpdfxfa_context.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'fpdfsdk/fpdfxfa') diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp index 1b69ff45b9..1345bc8a08 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp @@ -67,9 +67,10 @@ CPDFXFA_Context::~CPDFXFA_Context() { void CPDFXFA_Context::CloseXFADoc() { if (!m_pXFADoc) return; + + m_pXFADocView = nullptr; m_pXFADoc->CloseDoc(); m_pXFADoc.reset(); - m_pXFADocView = nullptr; } void CPDFXFA_Context::SetFormFillEnv( -- cgit v1.2.3