diff options
| author | Oliver Chang <ochang@chromium.org> | 2015-10-27 09:34:49 -0700 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2015-10-27 09:34:49 -0700 |
| commit | 8f16b69981730911aa6185451e4899137cc4fca2 (patch) | |
| tree | 1f2c8dc4dd446a204e14869b84bd60a949f2e7ce /fpdfsdk | |
| parent | 431ba1865443e5cba4dabc74e61ece4daba11b5b (diff) | |
| download | pdfium-8f16b69981730911aa6185451e4899137cc4fca2.tar.xz | |
Merge to XFA: Fix memory leak in FXJS_ReleaseRuntime.
Should fix a bunch of JS related memory leaks reported by LSan/DrMemory.
Clean merge.
TBR=tsepez@chromium.org
BUG=pdfium:242
Review URL: https://codereview.chromium.org/1417973009 .
(cherry picked from commit fbbb3c3de517309b6808d7a8f4c441aa0abf7065)
Review URL: https://codereview.chromium.org/1406053006 .
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/src/jsapi/fxjs_v8.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index 1f8c5728b0..dde32ce784 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -340,9 +340,15 @@ void FXJS_ReleaseRuntime(v8::Isolate* pIsolate, int maxID = CFXJS_ObjDefinition::MaxID(pIsolate); for (int i = 0; i < maxID; ++i) { CFXJS_ObjDefinition* pObjDef = CFXJS_ObjDefinition::ForID(pIsolate, i); - if (!pObjDef->m_StaticObj.IsEmpty()) { - v8::Local<v8::Object> pObj = - v8::Local<v8::Object>::New(pIsolate, pObjDef->m_StaticObj); + v8::Local<v8::Object> pObj; + if (pObjDef->m_ObjType == FXJSOBJTYPE_GLOBAL) { + pObj = + context->Global()->GetPrototype()->ToObject(context).ToLocalChecked(); + } else if (!pObjDef->m_StaticObj.IsEmpty()) { + pObj = v8::Local<v8::Object>::New(pIsolate, pObjDef->m_StaticObj); + } + + if (!pObj.IsEmpty()) { if (pObjDef->m_pDestructor) pObjDef->m_pDestructor(pObj); FXJS_FreePrivate(pObj); |