openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-11-23 06:40:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1596 fix:ime mem leak

Browse Source 
Merge pull request !1596 from 吴成文/master
This commit is contained in:
openharmony_ci 2024-11-22 10:00:43 +00:00 committed by Gitee
commit 1ad7f9f1c9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frameworks/kits/extension/src/js_inputmethod_extension.cpp
View File

@ -69,13 +69,18 @@ napi_value AttachInputMethodExtensionContext(napi_env env, void *value, void *)
IMSA_HILOGE("workContext is nullptr!"); IMSA_HILOGE("workContext is nullptr!");
return nullptr; return nullptr;
} }
napi_wrap( napi_status status = napi_wrap(
env, contextObj, workContext, env, contextObj, workContext,
[](napi_env, void *data, void *) { [](napi_env, void *data, void *) {
IMSA_HILOGI("finalizer for weak_ptr input method extension context is called."); IMSA_HILOGI("finalizer for weak_ptr input method extension context is called.");
delete static_cast<std::weak_ptr<InputMethodExtensionContext> *>(data); delete static_cast<std::weak_ptr<InputMethodExtensionContext> *>(data);
}, },
nullptr, nullptr); nullptr, nullptr);
if (status != napi_ok) {
IMSA_HILOGE("InputMethodExtensionContext wrap failed: %{public}d!", status);
delete workContext;
return nullptr;
}
return object; return object;
} }
@ -242,13 +247,17 @@ void JsInputMethodExtension::BindContext(napi_env env, napi_value obj)
context->Bind(jsRuntime_, shellContextRef.release()); context->Bind(jsRuntime_, shellContextRef.release());
IMSA_HILOGD("JsInputMethodExtension::SetProperty."); IMSA_HILOGD("JsInputMethodExtension::SetProperty.");
napi_set_named_property(env, obj, "context", contextObj); napi_set_named_property(env, obj, "context", contextObj);
napi_wrap( napi_status status = napi_wrap(
env, contextObj, workContext, env, contextObj, workContext,
[](napi_env, void *data, void *) { [](napi_env, void *data, void *) {
IMSA_HILOGI("Finalizer for weak_ptr input method extension context is called."); IMSA_HILOGI("Finalizer for weak_ptr input method extension context is called.");
delete static_cast<std::weak_ptr<InputMethodExtensionContext> *>(data); delete static_cast<std::weak_ptr<InputMethodExtensionContext> *>(data);
}, },
nullptr, nullptr); nullptr, nullptr);
if (status != napi_ok) {
IMSA_HILOGE("InputMethodExtensionContext wrap failed: %{public}d", status);
delete workContext;
}
} }
void JsInputMethodExtension::OnStart(const AAFwk::Want &want) void JsInputMethodExtension::OnStart(const AAFwk::Want &want)