summaryrefslogtreecommitdiff
path: root/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-10-06 14:53:13 -0400
committerDan Sinclair <dsinclair@chromium.org>2016-10-06 14:53:13 -0400
commitca03f7a1c654709152a411f665ce38c3626582e8 (patch)
tree21219202db1f20f84e8bc625662278091f856094 /fpdfsdk/fpdfxfa/cpdfxfa_document.cpp
parentf7ca7302bed831801a0b81ff4e1222c75833d2d6 (diff)
downloadpdfium-ca03f7a1c654709152a411f665ce38c3626582e8.tar.xz
Fixup MSan embeddertests
The embeddertests were closing the document before the formfill environment. This caused a use-after-free as we try to use the document during formfill destruction. This Cl fixes the destruction order in the embedder tests. As well, a few guards are put in place to keep the system from crashing if the wrong destruction order is called. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/2398063002 .
Diffstat (limited to 'fpdfsdk/fpdfxfa/cpdfxfa_document.cpp')
-rw-r--r--fpdfsdk/fpdfxfa/cpdfxfa_document.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp
index bd7f931c59..90a762ddf3 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp
@@ -45,6 +45,9 @@ CPDFXFA_Document::~CPDFXFA_Document() {
if (m_pSDKDoc) {
m_pSDKDoc->ClearAllFocusedAnnots();
+ // Once we're deleted the SDKDocument will point at a bad underlying
+ // doc so we need to reset it ...
+ m_pSDKDoc->ResetXFADocument();
m_pSDKDoc = nullptr;
}