From 13d9ff17caacb3da0339d164c4e4be7687e3d2a1 Mon Sep 17 00:00:00 2001 From: z30054037 Date: Wed, 18 Oct 2023 17:36:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/js/backup_ext/ext_backup_impl.cpp | 2 +- frameworks/native/backup_ext/src/ext_backup_js.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/js/backup_ext/ext_backup_impl.cpp b/frameworks/js/backup_ext/ext_backup_impl.cpp index 092bc8cfa..9f6b828b5 100644 --- a/frameworks/js/backup_ext/ext_backup_impl.cpp +++ b/frameworks/js/backup_ext/ext_backup_impl.cpp @@ -21,8 +21,8 @@ extern const char _binary_backup_extension_ability_abc_start[]; extern const char _binary_backup_extension_ability_abc_end[]; static napi_module _module = { - .nm_modname = "application.BackupExtensionAbility", .nm_filename = "application/libbackupextensionability_napi.so/BackupExtensionAbility.js", + .nm_modname = "application.BackupExtensionAbility", }; extern "C" __attribute__((constructor)) void NAPI_application_BackupExtensionAbility_AutoRegister() diff --git a/frameworks/native/backup_ext/src/ext_backup_js.cpp b/frameworks/native/backup_ext/src/ext_backup_js.cpp index 4905d2ce6..cb38dc3f2 100644 --- a/frameworks/native/backup_ext/src/ext_backup_js.cpp +++ b/frameworks/native/backup_ext/src/ext_backup_js.cpp @@ -300,7 +300,7 @@ static int DoCallJsMethod(CallJsParam *param) } AbilityRuntime::HandleEscape handleEscape(*jsRuntime); auto env = jsRuntime->GetNapiEnv(); - vector argv = {}; + std::vector argv; if (param->argParser != nullptr) { if (!param->argParser(env, argv)) { HILOGE("failed to get params."); @@ -318,7 +318,7 @@ static int DoCallJsMethod(CallJsParam *param) HILOGE("ResultValueParser must not null."); return EINVAL; } - napi_value result; + napi_value result = nullptr; napi_call_function(env, value, method, argv.size(), argv.data(), &result); if (!param->retParser(env, handleEscape.Escape(result))) { HILOGI("Parser js result fail."); -- Gitee From 580d8282be6c37f22e6a5a7b5d35abc450c456b7 Mon Sep 17 00:00:00 2001 From: z30054037 Date: Wed, 18 Oct 2023 17:36:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 --- frameworks/js/backup_ext/ext_backup_impl.cpp | 2 +- frameworks/native/backup_ext/src/ext_backup_js.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/js/backup_ext/ext_backup_impl.cpp b/frameworks/js/backup_ext/ext_backup_impl.cpp index 092bc8cfa..9f6b828b5 100644 --- a/frameworks/js/backup_ext/ext_backup_impl.cpp +++ b/frameworks/js/backup_ext/ext_backup_impl.cpp @@ -21,8 +21,8 @@ extern const char _binary_backup_extension_ability_abc_start[]; extern const char _binary_backup_extension_ability_abc_end[]; static napi_module _module = { - .nm_modname = "application.BackupExtensionAbility", .nm_filename = "application/libbackupextensionability_napi.so/BackupExtensionAbility.js", + .nm_modname = "application.BackupExtensionAbility", }; extern "C" __attribute__((constructor)) void NAPI_application_BackupExtensionAbility_AutoRegister() diff --git a/frameworks/native/backup_ext/src/ext_backup_js.cpp b/frameworks/native/backup_ext/src/ext_backup_js.cpp index 4905d2ce6..cb38dc3f2 100644 --- a/frameworks/native/backup_ext/src/ext_backup_js.cpp +++ b/frameworks/native/backup_ext/src/ext_backup_js.cpp @@ -300,7 +300,7 @@ static int DoCallJsMethod(CallJsParam *param) } AbilityRuntime::HandleEscape handleEscape(*jsRuntime); auto env = jsRuntime->GetNapiEnv(); - vector argv = {}; + std::vector argv; if (param->argParser != nullptr) { if (!param->argParser(env, argv)) { HILOGE("failed to get params."); @@ -318,7 +318,7 @@ static int DoCallJsMethod(CallJsParam *param) HILOGE("ResultValueParser must not null."); return EINVAL; } - napi_value result; + napi_value result = nullptr; napi_call_function(env, value, method, argv.size(), argv.data(), &result); if (!param->retParser(env, handleEscape.Escape(result))) { HILOGI("Parser js result fail."); -- Gitee