XFA: contention between FXJSE and FXJS over isolate data slots

fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp

 // Copyright 2014 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 "../../../public/fpdf_formfill.h"
 #include "../../include/fsdk_define.h"
 #include "../../include/fsdk_mgr.h"
 #include "../../include/fpdfxfa/fpdfxfa_doc.h"
@@ skipping 15 matching lines @@
   delete g_pApp;
   g_pApp = NULL;
 }
 
 CJS_RuntimeFactory* g_GetJSRuntimeFactory() {
   static CJS_RuntimeFactory g_JSRuntimeFactory;
   return &g_JSRuntimeFactory;
 }
 
 CPDFXFA_App::CPDFXFA_App()
-    : m_bInitRuntime(FALSE),
+    : m_bJavaScriptInitialized(FALSE),
       m_pXFAApp(NULL),
       m_pFontMgr(NULL),
       m_hJSERuntime(NULL),
       m_csAppType(JS_STR_VIEWERTYPE_STANDARD) {
   m_pJSRuntimeFactory = g_GetJSRuntimeFactory();
   m_pJSRuntimeFactory->AddRef();
   m_pEnvList.RemoveAll();
 }
 
 CPDFXFA_App::~CPDFXFA_App() {
@@ skipping 24 matching lines @@
     return FALSE;
 
   m_pFontMgr = IXFA_FontMgr::CreateDefault();
   if (!m_pFontMgr)
     return FALSE;
 
   m_pXFAApp->SetDefaultFontMgr(m_pFontMgr);
   return TRUE;
 }
 
-FX_BOOL CPDFXFA_App::InitRuntime(FX_BOOL bReset) {
-  if (bReset) {
-    m_bInitRuntime = FALSE;
-    return TRUE;
-  }
-  if (m_bInitRuntime) {
-    return TRUE;
-  }
-  m_bInitRuntime = TRUE;
-  return FALSE;
-}
-
 FX_BOOL CPDFXFA_App::AddFormFillEnv(CPDFDoc_Environment* pEnv) {
   if (!pEnv)
     return FALSE;
 
   m_pEnvList.Add(pEnv);
   return TRUE;
 }
 
 FX_BOOL CPDFXFA_App::RemoveFormFillEnv(CPDFDoc_Environment* pEnv) {
   if (!pEnv)
     return FALSE;
 
   int nFind = m_pEnvList.Find(pEnv);
   if (nFind != -1) {
     m_pEnvList.RemoveAt(nFind);
     return TRUE;
   }
 
   return FALSE;
 }
-void CPDFXFA_App::ReleaseRuntime() {
-  v8::Global<v8::Context> context;
-  JS_ReleaseRuntime((v8::Isolate*)m_hJSERuntime, context);

[Tom Sepez, 2015/09/17 21:58:39]

Different segv, can't pass NULL ctx here. Already taken care of elsewhere.

-}
 
 void CPDFXFA_App::GetAppType(CFX_WideString& wsAppType) {
   wsAppType = m_csAppType;
 }
 
 void CPDFXFA_App::GetAppName(CFX_WideString& wsName) {
   CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv) {
     wsName = pEnv->FFI_GetAppName();
   }
@@ skipping 420 matching lines @@
   return FALSE;
 }
 
 IFWL_AdapterTimerMgr* CPDFXFA_App::GetTimerMgr() {
   CXFA_FWLAdapterTimerMgr* pAdapter = NULL;
   CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv)
     pAdapter = new CXFA_FWLAdapterTimerMgr(pEnv);
   return pAdapter;
 }