summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Fang <jun_fang@foxitsoftware.com>2016-02-04 17:26:42 -0800
committerJun Fang <jun_fang@foxitsoftware.com>2016-02-04 17:26:42 -0800
commit54537d1bb5f6bddd37ed4ca28cd4d5cfb4e95942 (patch)
treef36d34b9184fe7d12637b27033181ef8025f7435
parent0078f44142c6cce4c2fccbe5c8e7b877a7315c3d (diff)
downloadpdfium-54537d1bb5f6bddd37ed4ca28cd4d5cfb4e95942.tar.xz
Fix a crashier in CPDFSDK_Document::GetPageView()
BUG=pdfium:369 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1667643002 .
-rw-r--r--fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp23
1 files changed, 10 insertions, 13 deletions
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
index b8549fce74..b937af4f2c 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
@@ -45,18 +45,6 @@ CPDFXFA_Document::CPDFXFA_Document(CPDF_Document* pPDFDoc,
}
CPDFXFA_Document::~CPDFXFA_Document() {
- if (m_pJSContext && m_pSDKDoc && m_pSDKDoc->GetEnv())
- m_pSDKDoc->GetEnv()->GetJSRuntime()->ReleaseContext(m_pJSContext);
-
- delete m_pSDKDoc;
-
- if (m_pPDFDoc) {
- CPDF_Parser* pParser = m_pPDFDoc->GetParser();
- if (pParser)
- delete pParser;
- else
- delete m_pPDFDoc;
- }
if (m_pXFADoc) {
IXFA_App* pApp = m_pApp->GetXFAApp();
if (pApp) {
@@ -67,6 +55,16 @@ CPDFXFA_Document::~CPDFXFA_Document() {
}
delete m_pXFADoc;
}
+ if (m_pJSContext && m_pSDKDoc && m_pSDKDoc->GetEnv())
+ m_pSDKDoc->GetEnv()->GetJSRuntime()->ReleaseContext(m_pJSContext);
+ delete m_pSDKDoc;
+ if (m_pPDFDoc) {
+ CPDF_Parser* pParser = m_pPDFDoc->GetParser();
+ if (pParser)
+ delete pParser;
+ else
+ delete m_pPDFDoc;
+ }
}
FX_BOOL CPDFXFA_Document::LoadXFADoc() {
@@ -490,7 +488,6 @@ void CPDFXFA_Document::PageViewEvent(IXFA_PageView* pPageView,
if (!pPage)
return;
pEnv->FFI_PageEvent(pPage->GetPageIndex(), dwFlags);
- m_pSDKDoc->GetPageView(pPage)->ClearFXAnnots();
pPage->Release();
}