Fixup formfiller cleanup

fpdfsdk/cpdfsdk_formfillenvironment.cpp

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 
 #include <memory>
 
@@ skipping 21 matching lines @@
 
 CPDFSDK_FormFillEnvironment::CPDFSDK_FormFillEnvironment(
     UnderlyingDocumentType* pDoc,
     FPDF_FORMFILLINFO* pFFinfo)
     : m_pInfo(pFFinfo),
       m_pSDKDoc(new CPDFSDK_Document(pDoc, this)),
       m_pUnderlyingDoc(pDoc),
       m_pSysHandler(new CFX_SystemHandler(this)) {}
 
 CPDFSDK_FormFillEnvironment::~CPDFSDK_FormFillEnvironment() {
+  // CPDFSDK_AnnotHandlerMgr will try to access the form fill environment
+  // when it cleans up the CFFL_InteractiveFormFiller. So, we must make sure
+  // it is cleaned up before the CFFL_InteractiveFormFiller.

[Lei Zhang, 2016/10/11 20:54:52]

Refer to |m_pFormFiller| explicitly here?

[dsinclair, 2016/10/11 21:01:59]

Done.

+  m_pAnnotHandlerMgr.reset();
+
+  // Must destroy the |CFFL_InteractiveFormFiller| before the environment

[Lei Zhang, 2016/10/11 20:54:52]

|m_pFormFiller|

[dsinclair, 2016/10/11 21:01:59]

Done.

+  // because any created form widgets hold a pointer to the environment.
+  // Those widgets may call things like |KillTimer|  as they are shutdown.

[Lei Zhang, 2016/10/11 20:54:52]

KillTimer() and no double space after.

[dsinclair, 2016/10/11 21:01:59]

Done.

+  m_pFormFiller.reset();
+
 #ifdef PDF_ENABLE_XFA
   CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance();
   if (pProvider->m_pEnvList.GetSize() == 0)
     pProvider->SetJavaScriptInitialized(FALSE);
 #endif  // PDF_ENABLE_XFA
   if (m_pInfo && m_pInfo->Release)
     m_pInfo->Release(m_pInfo);
 }
 
 int CPDFSDK_FormFillEnvironment::JS_appAlert(const FX_WCHAR* Msg,
@@ skipping 493 matching lines @@
   delete[] pbuff;
   return wsRet;
 }
 
 void CPDFSDK_FormFillEnvironment::PageEvent(int iPageCount,
                                             uint32_t dwEventType) const {
   if (m_pInfo && m_pInfo->FFI_PageEvent)
     m_pInfo->FFI_PageEvent(m_pInfo, iPageCount, dwEventType);
 }
 #endif  // PDF_ENABLE_XFA