From 8b90ee66872aa883fc46ac2b6e7acad35c7c96c6 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 25 Nov 2015 10:38:09 -0800
Subject: Merge to XFA: CFXJS_ObjDefinition's lifetime must match isolate.

Review URL: https://codereview.chromium.org/1468423004 .
(cherry picked from commit 628f7053cc646c58c61add247c75bc65ac135327)

BUG=561184
TBR=jochen@chromium.org

Review URL: https://codereview.chromium.org/1473943002 .
---
 fpdfsdk/src/jsapi/fxjs_v8.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'fpdfsdk/src/jsapi/fxjs_v8.cpp')

diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp
index 9c2c538aa8..9a3a268652 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8.cpp
+++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp
@@ -356,12 +356,14 @@ void FXJS_ReleaseRuntime(v8::Isolate* pIsolate,
         pObjDef->m_pDestructor(pObj);
       FXJS_FreePrivate(pObj);
     }
-    delete pObjDef;
   }
 
   if (pIsolate == g_isolate && --g_isolate_ref_count > 0)
     return;
 
+  for (int i = 0; i < maxID; ++i)
+    delete CFXJS_ObjDefinition::ForID(pIsolate, i);
+
   pIsolate->SetData(g_embedderDataSlot, nullptr);
   delete pData;
 }
-- 
cgit v1.2.3