diff --git a/frameworks/native/backup_ext/src/ext_backup_js.cpp b/frameworks/native/backup_ext/src/ext_backup_js.cpp index e22ac7fc3c2a1c44d9ac5aa95ca699301ccbd0a6..e7fdbe3a3fa81ed7cfee1ba30743eff49892ef0b 100644 --- a/frameworks/native/backup_ext/src/ext_backup_js.cpp +++ b/frameworks/native/backup_ext/src/ext_backup_js.cpp @@ -256,7 +256,10 @@ static bool CallCatchPromise(AbilityRuntime::JsRuntime &jsRuntime, napi_value re return false; } napi_value argv[1] = {ret}; - napi_call_function(env, result, method, 1, argv, nullptr); + if (napi_call_function(env, result, method, 1, argv, nullptr) != napi_ok) { + HILOGE("napi call function failed"); + return false; + } return true; } @@ -285,7 +288,10 @@ static bool CallPromise(AbilityRuntime::JsRuntime &jsRuntime, napi_value result, return false; } napi_value argv[1] = {ret}; - napi_call_function(env, result, method, 1, argv, nullptr); + if (napi_call_function(env, result, method, 1, argv, nullptr) != napi_ok) { + HILOGE("napi call function failed"); + return false; + } if (!CallCatchPromise(jsRuntime, result, callbackInfo)) { HILOGE("CallCatchPromise failed."); return false; @@ -319,7 +325,10 @@ static bool CallCatchPromiseEx(AbilityRuntime::JsRuntime &jsRuntime, napi_value return false; } napi_value argv[1] = {ret}; - napi_call_function(env, result, method, 1, argv, nullptr); + if (napi_call_function(env, result, method, 1, argv, nullptr) != napi_ok) { + HILOGE("napi call function failed"); + return false; + } return true; } @@ -348,7 +357,10 @@ static bool CallPromiseEx(AbilityRuntime::JsRuntime &jsRuntime, napi_value resul return false; } napi_value argv[1] = {ret}; - napi_call_function(env, result, method, 1, argv, nullptr); + if (napi_call_function(env, result, method, 1, argv, nullptr) != napi_ok) { + HILOGE("napi call function failed"); + return false; + } if (!CallCatchPromiseEx(jsRuntime, result, callbackInfoEx)) { HILOGE("CallCatchPromiseEx failed."); return false; @@ -382,7 +394,10 @@ static bool CallPromiseEx(AbilityRuntime::JsRuntime &jsRuntime, napi_value resul return false; } napi_value argv[1] = {ret}; - napi_call_function(env, result, method, 1, argv, nullptr); + if (napi_call_function(env, result, method, 1, argv, nullptr) != napi_ok) { + HILOGE("napi call function failed"); + return false; + } return true; } @@ -802,7 +817,9 @@ static int InvokeJsMethod(CallJsParam *param, AbilityRuntime::HandleEscape& hand } napi_value result; HILOGI("Extension start do call current js method, methodName:%{public}s", param->funcName.c_str()); - napi_call_function(env, value, method, argv.size(), argv.data(), &result); + if (napi_call_function(env, value, method, argv.size(), argv.data(), &result) != napi_ok) { + HILOGE("napi call function failed"); + } if (!param->retParser(env, handleEscape.Escape(result))) { HILOGE("Parser js result fail."); return EINVAL; diff --git a/utils/include/b_hiaudit/zip_util.h b/utils/include/b_hiaudit/zip_util.h index 6efd7728cff8455cb8094e1f81a32437efc43ae1..a2b32e8e4836cea2c82913ed3b3963b8000f1b96 100644 --- a/utils/include/b_hiaudit/zip_util.h +++ b/utils/include/b_hiaudit/zip_util.h @@ -28,8 +28,8 @@ enum { class ZipUtil { public: static zipFile CreateZipFile(const std::string &zipPath, int32_t zipMode = APPEND_STATUS_CREATE); - static void CloseZipFile(zipFile &zipfile); - static int AddFileInZip(zipFile &zipfile, const std::string &srcFile, int keepParentPathStatus, + static void CloseZipFile(zipFile zipfile); + static int AddFileInZip(zipFile zipfile, const std::string &srcFile, int keepParentPathStatus, const std::string &dstFileName = ""); static std::string GetDestFilePath(const std::string &srcFile, const std::string &destFilePath, int keepParentPathStatus); diff --git a/utils/src/b_hiaudit/zip_util.cpp b/utils/src/b_hiaudit/zip_util.cpp index 321e916c663bb35c0ecf9d1811b4954c45eb7480..bfb2d66977489f9f3fe3075f96ff3d4bf155a1c4 100644 --- a/utils/src/b_hiaudit/zip_util.cpp +++ b/utils/src/b_hiaudit/zip_util.cpp @@ -33,12 +33,12 @@ zipFile ZipUtil::CreateZipFile(const std::string &zipPath, int32_t zipMode) return zipOpen(zipPath.c_str(), zipMode); } -void ZipUtil::CloseZipFile(zipFile &zipfile) +void ZipUtil::CloseZipFile(zipFile zipfile) { zipClose(zipfile, nullptr); } -int ZipUtil::AddFileInZip(zipFile &zipfile, const std::string &srcFile, int keepParentPathStatus, +int ZipUtil::AddFileInZip(zipFile zipfile, const std::string &srcFile, int keepParentPathStatus, const std::string &destFileName) { zip_fileinfo zipInfo;