From 72e37e33a3141970453ec53f8a2765c9a47f0eed Mon Sep 17 00:00:00 2001
From: zouyousong <332159254@qq.com>
Date: Tue, 22 Mar 2022 16:49:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E6=BA=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=8D=95=20Signed-off-by:=20zouyousong=20<332159254@q?=
 =?UTF-8?q?q.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OAT.xml                                       |  9 +--
 client/update_client.cpp                      | 47 +++++++------
 client/update_client.h                        | 11 +++
 client/update_session.cpp                     |  4 +-
 engine/src/progress_thread.cpp                |  2 +-
 engine/src/update_service.cpp                 |  6 +-
 .../UpdaterOnRemoteRequest_fuzzer.cpp         |  2 +
 test/unittest/update_client/client_stub.cpp   | 67 +++++++++++--------
 .../update_engine/server_unittest.cpp         | 26 +++----
 9 files changed, 103 insertions(+), 71 deletions(-)

diff --git a/OAT.xml b/OAT.xml
index 5e9dffda..a2326df2 100755
--- a/OAT.xml
+++ b/OAT.xml
@@ -12,10 +12,11 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
-	 
-	 Notes:
-	 This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun. 	 
---> 
+-->
+<!--
+    Notes:
+    This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun. 	 
+-->
 <!-- OAT(OSS Audit Tool) configuration guide:
 basedir: Root dir, the basedir + project path is the real source file location.
 licensefile: 
diff --git a/client/update_client.cpp b/client/update_client.cpp
index 5ecaaec9..496891f2 100644
--- a/client/update_client.cpp
+++ b/client/update_client.cpp
@@ -146,7 +146,7 @@ bool UpdateClient::CheckUpgradeType(const std::string &type)
     upgradeType.erase(upgradeType.find_last_not_of(" ") + 1);
     std::transform(upgradeType.begin(), upgradeType.end(), upgradeType.begin(), ::tolower);
     for (auto inter = upgradeTypes.cbegin(); inter != upgradeTypes.cend(); inter++) {
-        if ((*inter).compare(upgradeType) == 0) {
+        if (!(*inter).compare(upgradeType)) {
             return true;
         }
     }
@@ -162,7 +162,7 @@ bool UpdateClient::CheckUpgradeFile(const std::string &upgradeFile)
     file.erase(0, file.find_first_not_of(" "));
     file.erase(file.find_last_not_of(" ") + 1);
     int32_t pos = (int32_t)file.find_first_of('/');
-    if (pos != 0) {
+    if (pos) {
         return false;
     }
     pos = (int32_t)file.find_last_of('.');
@@ -171,13 +171,13 @@ bool UpdateClient::CheckUpgradeFile(const std::string &upgradeFile)
     }
     std::string postfix = file.substr(pos + 1, -1);
     std::transform(postfix.begin(), postfix.end(), postfix.begin(), ::tolower);
-    if (postfix.compare("bin") == 0) {
+    if (!postfix.compare("bin")) {
         return true;
-    } else if (postfix.compare("zip") == 0) {
+    } else if (!postfix.compare("zip")) {
         return true;
-    } else if (postfix.compare("lz4") == 0) {
+    } else if (!postfix.compare("lz4")) {
         return true;
-    } else if (postfix.compare("gz") == 0) {
+    } else if (!postfix.compare("gz")) {
         return true;
     }
     return false;
@@ -232,9 +232,9 @@ napi_value UpdateClient::StartSession(napi_env env,
         static_cast<int>(callbackStartIndex));
     std::shared_ptr<UpdateSession> sess = nullptr;
     if (argc > callbackStartIndex) {
-        sess = std::make_shared<UpdateAsyncession>(this, type, argc, 1);
+        CLIENT_MAKE_SHARED(sess = std::make_shared<UpdateAsyncession>(this, type, argc, 1), return nullptr);
     } else {
-        sess = std::make_shared<UpdatePromiseSession>(this, type, argc, 0);
+        CLIENT_MAKE_SHARED(sess = std::make_shared<UpdatePromiseSession>(this, type, argc, 0), return nullptr);
     }
     CLIENT_CHECK_NAPI_CALL(env, sess != nullptr, return nullptr, "Failed to create update session");
     AddSession(sess);
@@ -263,7 +263,8 @@ napi_value UpdateClient::CancelUpgrade(napi_env env, napi_callback_info info)
     CLIENT_CHECK_NAPI_CALL(env, status == napi_ok && argc == 0, return nullptr, "Error get cb info");
     CLIENT_LOGE("CancelUpgrade");
     std::shared_ptr<UpdateSession> sess = nullptr;
-    sess = std::make_shared<UpdateAsyncessionNoCallback>(this, SESSION_CANCEL_UPGRADE, argc, 0);
+    CLIENT_MAKE_SHARED(sess = std::make_shared<UpdateAsyncessionNoCallback>(this, SESSION_CANCEL_UPGRADE, argc, 0),
+        return nullptr);
     CLIENT_CHECK_NAPI_CALL(env, sess != nullptr, return nullptr, "Failed to create update session");
     AddSession(sess);
     napi_value retValue = sess->StartWork(env, 0, args,
@@ -282,7 +283,8 @@ napi_value UpdateClient::DownloadVersion(napi_env env, napi_callback_info info)
     CLIENT_CHECK_NAPI_CALL(env, status == napi_ok, return nullptr, "Error get cb info");
     CLIENT_LOGE("DownloadVersion");
     std::shared_ptr<UpdateSession> sess = nullptr;
-    sess = std::make_shared<UpdateAsyncessionNoCallback>(this, SESSION_DOWNLOAD, argc, 0);
+    CLIENT_MAKE_SHARED(sess = std::make_shared<UpdateAsyncessionNoCallback>(this, SESSION_DOWNLOAD, argc, 0),
+        return nullptr);
     CLIENT_CHECK_NAPI_CALL(env, sess != nullptr, return nullptr, "Failed to create update session");
     AddSession(sess);
     napi_value retValue = sess->StartWork(env, 0, args,
@@ -300,7 +302,8 @@ napi_value UpdateClient::UpgradeVersion(napi_env env, napi_callback_info info)
     napi_status status = napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
     CLIENT_CHECK_NAPI_CALL(env, status == napi_ok, return nullptr, "Error get cb info");
     std::shared_ptr<UpdateSession> sess = nullptr;
-    sess = std::make_shared<UpdateAsyncessionNoCallback>(this, SESSION_UPGRADE, argc, 0);
+    CLIENT_MAKE_SHARED(sess = std::make_shared<UpdateAsyncessionNoCallback>(this, SESSION_UPGRADE, argc, 0),
+        return nullptr);
     CLIENT_CHECK_NAPI_CALL(env, sess != nullptr, return nullptr, "Failed to create update session");
     AddSession(sess);
     napi_value retValue = sess->StartWork(env, 0, args,
@@ -327,9 +330,11 @@ napi_value UpdateClient::SetUpdatePolicy(napi_env env, napi_callback_info info)
 
     std::shared_ptr<UpdateSession> sess = nullptr;
     if (argc >= MID_ARGC) {
-        sess = std::make_shared<UpdateAsyncession>(this, SESSION_SET_POLICY, argc, 1);
+        CLIENT_MAKE_SHARED(sess = std::make_shared<UpdateAsyncession>(this, SESSION_SET_POLICY, argc, 1),
+            return nullptr);
     } else {
-        sess = std::make_shared<UpdatePromiseSession>(this, SESSION_SET_POLICY, argc, 0);
+        CLIENT_MAKE_SHARED(sess = std::make_shared<UpdatePromiseSession>(this, SESSION_SET_POLICY, argc, 0),
+            return nullptr);
     }
     CLIENT_CHECK_NAPI_CALL(env, sess != nullptr, return nullptr, "Failed to create update session");
     AddSession(sess);
@@ -414,7 +419,8 @@ napi_value UpdateClient::VerifyUpdatePackage(napi_env env, napi_callback_info in
 
     CLIENT_LOGE("VerifyUpdatePackage");
     std::shared_ptr<UpdateSession> sess = nullptr;
-    sess = std::make_shared<UpdateAsyncessionNoCallback>(this, SESSION_VERIFY_PACKAGE, argc, 0);
+    CLIENT_MAKE_SHARED(sess = std::make_shared<UpdateAsyncessionNoCallback>(this, SESSION_VERIFY_PACKAGE, argc, 0),
+        return nullptr);
     CLIENT_CHECK_NAPI_CALL(env, sess != nullptr, return nullptr, "Fail to create update session");
     AddSession(sess);
     size_t startIndex = 2;
@@ -443,8 +449,9 @@ napi_value UpdateClient::SubscribeEvent(napi_env env, napi_callback_info info)
     int ret = UpdateClient::GetStringValue(env, args[0], eventType);
     CLIENT_CHECK_NAPI_CALL(env, ret == napi_ok, return nullptr, "Failed to get event type");
     CLIENT_CHECK(FindSessionByHandle(env, eventType, args[1]) == nullptr, return nullptr, "Handle has been sub");
-
-    std::shared_ptr<UpdateSession> sess = std::make_shared<UpdateListener>(this, SESSION_SUBSCRIBE, argc, 1, false);
+    std::shared_ptr<UpdateSession> sess = nullptr;
+    CLIENT_MAKE_SHARED(sess = std::make_shared<UpdateListener>(this, SESSION_SUBSCRIBE, argc, 1, false),
+        return nullptr);
     CLIENT_CHECK_NAPI_CALL(env, sess != nullptr, return nullptr, "Failed to create listener");
     AddSession(sess);
     napi_value retValue = sess->StartWork(env, 1, args,
@@ -497,7 +504,7 @@ int32_t UpdateClient::ProcessUnsubscribe(const std::string &eventType, size_t ar
 
         UpdateListener *listener = static_cast<UpdateListener *>(iter->second.get());
         if (listener->GetType() != SESSION_SUBSCRIBE
-            || eventType.compare(listener->GetEventType()) != 0) {
+            || eventType.compare(listener->GetEventType())) {
             continue;
         }
         CLIENT_LOGI("ProcessUnsubscribe remove session");
@@ -530,7 +537,7 @@ UpdateSession *UpdateClient::FindSessionByHandle(napi_env env, const std::string
         if (listener->GetType() != SESSION_SUBSCRIBE) {
             continue;
         }
-        if ((eventType.compare(listener->GetEventType()) == 0) && listener->CheckEqual(env_, arg, eventType)) {
+        if ((!eventType.compare(listener->GetEventType())) && listener->CheckEqual(env_, arg, eventType)) {
             return listener;
         }
     }
@@ -589,7 +596,7 @@ void UpdateClient::PublishToJS(const std::string &type, int32_t retcode, const U
         }
         hasNext = GetNextSessionId(nextSessId);
         UpdateListener *listener = static_cast<UpdateListener *>((iter->second).get());
-        if ((listener->GetType() != SESSION_SUBSCRIBE) || (type.compare(listener->GetEventType()) != 0)) {
+        if ((listener->GetType() != SESSION_SUBSCRIBE) || (type.compare(listener->GetEventType()))) {
             continue;
         }
         listener->NotifyJS(env_, thisVar, retcode, result);
@@ -688,7 +695,7 @@ void UpdateClient::NotifyUpgradeProgresss(const Progress &progress)
 
 void UpdateClient::NotifyVerifyProgresss(int32_t retCode, uint32_t percent)
 {
-    verifyProgress_.status = (retCode == 0) ? UPDATE_STATE_VERIFY_SUCCESS : UPDATE_STATE_VERIFY_FAIL;
+    verifyProgress_.status = (!retCode) ? UPDATE_STATE_VERIFY_SUCCESS : UPDATE_STATE_VERIFY_FAIL;
     verifyProgress_.percent = percent;
 
     UpdateResult result;
diff --git a/client/update_client.h b/client/update_client.h
index 8c7b2939..94308840 100644
--- a/client/update_client.h
+++ b/client/update_client.h
@@ -54,6 +54,17 @@ static constexpr OHOS::HiviewDFX::HiLogLabel UPDATE_CLIENT = {LOG_CORE, 0, "UPDA
         exper;                            \
     }
 
+
+#define  CLIENT_MAKE_SHARED(exec_expr0, exec_expr1)    \
+    do {                                               \
+        try {                                          \
+            exec_expr0;                                \
+        } catch (...) {                                \
+                CLIENT_LOGE("Make shared failed");     \
+                exec_expr1;                            \
+        }                                              \
+    } while (0)
+
 namespace updateClient {
 // Update status
 enum ClientStatus {
diff --git a/client/update_session.cpp b/client/update_session.cpp
index 0c3afaf7..8d639cdd 100644
--- a/client/update_session.cpp
+++ b/client/update_session.cpp
@@ -179,7 +179,7 @@ void UpdatePromiseSession::CompleteWork(napi_env env, napi_status status)
     UpdateResult result;
     int32_t fail = 0;
     client_->GetUpdateResult(type_, result, fail);
-    if (fail == 0) {
+    if (!fail) {
         result.buildJSObject(env, processResult, result);
         napi_resolve_deferred(env, deferred_, processResult);
     } else {
@@ -231,7 +231,7 @@ bool UpdateListener::CheckEqual(napi_env env, napi_value handler, const std::str
     napi_status status = napi_get_reference_value(env, handlerRef_, &handlerTemp);
     CLIENT_CHECK_NAPI_CALL(env, status == napi_ok, return false, "Failed to get reference");
     napi_strict_equals(env, handler, handlerTemp, &isEquals);
-    return isEquals && (type.compare(eventType_) == 0);
+    return isEquals && (!type.compare(eventType_));
 }
 
 void UpdateListener::RemoveHandlerRef(napi_env env)
diff --git a/engine/src/progress_thread.cpp b/engine/src/progress_thread.cpp
index d8a69ac4..e49080d6 100755
--- a/engine/src/progress_thread.cpp
+++ b/engine/src/progress_thread.cpp
@@ -163,7 +163,7 @@ int32_t DownloadThread::DownloadCallback(uint32_t percent, UpgradeStatus status,
         return -1;
     }
     if (status == UPDATE_STATE_DOWNLOAD_FAIL) {
-        if (access(downloadFileName_.c_str(), 0) == 0) {
+        if (!access(downloadFileName_.c_str(), 0)) {
             unlink(downloadFileName_.c_str());
         }
     } else if (percent != DOWNLOAD_FINISH_PERCENT
diff --git a/engine/src/update_service.cpp b/engine/src/update_service.cpp
index 2c122f49..d50ba631 100644
--- a/engine/src/update_service.cpp
+++ b/engine/src/update_service.cpp
@@ -175,7 +175,7 @@ int32_t UpdateService::DownloadVersion()
     std::string downloadFileName = BASE_PATH + "/" + versionInfo_.result[0].verifyInfo;
     size_t localFileLength = DownloadThread::GetLocalFileLength(downloadFileName);
     ENGINE_LOGI("Download %zu %s", localFileLength, downloadFileName.c_str());
-    if (localFileLength == versionInfo_.result[0].size && versionInfo_.result[0].size != 0) {
+    if (localFileLength == versionInfo_.result[0].size && versionInfo_.result[0].size) {
         progress0.percent = DOWNLOAD_FINISH_PERCENT;
         progress0.status = UPDATE_STATE_DOWNLOAD_SUCCESS;
         DownloadCallback(downloadFileName, progress0);
@@ -297,7 +297,7 @@ void UpdateService::ReadDataFromSSL(int32_t engineSocket)
     int32_t ret = SSL_connect(ssl);
     if (ret != -1) {
         int32_t len = SSL_read(ssl, buffer.data(), JSON_MAX_SIZE);
-        if (len > 0 && ParseJsonFile(buffer, versionInfo_, downloadUrl_) == 0) {
+        if (len > 0 && !ParseJsonFile(buffer, versionInfo_, downloadUrl_)) {
             result = HAS_NEW_VERSION;
             errMsg = "";
         } else {
@@ -423,7 +423,7 @@ bool UpdateService::VerifyDownloadPkg(const std::string &pkgName, Progress &prog
     std::vector<uint8_t> digest = UpdateHelper::HexToDegist(versionInfo_.result[0].verifyInfo);
     ret = VerifyPackage(pkgName.c_str(),
         SIGNING_CERT_NAME.c_str(), versionInfo_.result[0].versionCode.c_str(), digest.data(), digest.size());
-    if (ret != 0) {
+    if (ret) {
         progress.endReason = "Upgrade package verify Failed";
         ENGINE_LOGE("Package %s verification Failed", pkgName.c_str());
         return false;
diff --git a/test/fuzztest/UpdaterOnRemoteRequest_fuzzer/UpdaterOnRemoteRequest_fuzzer.cpp b/test/fuzztest/UpdaterOnRemoteRequest_fuzzer/UpdaterOnRemoteRequest_fuzzer.cpp
index 7cf967bf..e7946d3b 100644
--- a/test/fuzztest/UpdaterOnRemoteRequest_fuzzer/UpdaterOnRemoteRequest_fuzzer.cpp
+++ b/test/fuzztest/UpdaterOnRemoteRequest_fuzzer/UpdaterOnRemoteRequest_fuzzer.cpp
@@ -65,6 +65,7 @@ public:
 
     virtual int32_t GetUpgradeStatus (UpgradeInfo &info)
     {
+        UNUSED(info);
         return 0;
     }
 
@@ -80,6 +81,7 @@ public:
 
     virtual int32_t Cancel(int32_t service)
     {
+        UNUSED(service);
         return 0;
     }
 
diff --git a/test/unittest/update_client/client_stub.cpp b/test/unittest/update_client/client_stub.cpp
index 78534d11..3e37d0d8 100644
--- a/test/unittest/update_client/client_stub.cpp
+++ b/test/unittest/update_client/client_stub.cpp
@@ -104,7 +104,9 @@ extern "C" {
 
 napi_status napi_create_string_utf8(napi_env env, const char *str, size_t length, napi_value *result)
 {
-    *result = CreateNapiValue(napi_string, str);
+    if (result != NULL) {
+        *result = CreateNapiValue(napi_string, str);
+    }
     return napi_status::napi_ok;
 }
 
@@ -244,39 +246,39 @@ napi_status napi_get_named_property(napi_env env, napi_value object, const char*
     TestNApiValue* testValue = (TestNApiValue*)object;
 
     if (testValue->GetType() == TEST_NVALUE_TYPE_CONTEXT) {
-        if (strcmp(utf8name, "serverAddr") == 0) {
+        if (!strcmp(utf8name, "serverAddr")) {
             *result = CreateNapiValue(napi_string, "10.50.40.92");
-        } else if (strcmp(utf8name, "upgradeDevId") == 0) {
+        } else if (!strcmp(utf8name, "upgradeDevId")) {
             *result = CreateNapiValue(napi_string, testEnv->clientContext.upgradeDevId.c_str());
-        } else if (strcmp(utf8name, "controlDevId") == 0) {
+        } else if (!strcmp(utf8name, "controlDevId")) {
             *result = CreateNapiValue(napi_string, testEnv->clientContext.controlDevId.c_str());
-        } else if (strcmp(utf8name, "upgradeApp") == 0) {
+        } else if (!strcmp(utf8name, "upgradeApp")) {
             *result = CreateNapiValue(napi_string, testEnv->clientContext.upgradeApp.c_str());
-        } else if (strcmp(utf8name, "type") == 0) {
+        } else if (!strcmp(utf8name, "type")) {
             *result = CreateNapiValue(napi_number, &testEnv->clientContext.type);
         }
     } else if (testValue->GetType() == TEST_NVALUE_TYPE_UPGRADE) {
-        if (strcmp(utf8name, "versionName") == 0) {
+        if (!strcmp(utf8name, "versionName")) {
             *result = CreateNapiValue(napi_string, testEnv->pakcageInfo.result[0].versionName.c_str());
-        } else if (strcmp(utf8name, "versionCode") == 0) {
+        } else if (!strcmp(utf8name, "versionCode")) {
             *result = CreateNapiValue(napi_string, testEnv->pakcageInfo.result[0].versionCode.c_str());
-        } else if (strcmp(utf8name, "verifyInfo") == 0) {
+        } else if (!strcmp(utf8name, "verifyInfo")) {
             *result = CreateNapiValue(napi_string, testEnv->pakcageInfo.result[0].verifyInfo.c_str());
-        } else if (strcmp(utf8name, "descriptPackageId") == 0) {
+        } else if (!strcmp(utf8name, "descriptPackageId")) {
             *result = CreateNapiValue(napi_string, testEnv->pakcageInfo.result[0].descriptPackageId.c_str());
-        } else if (strcmp(utf8name, "packageType") == 0) {
+        } else if (!strcmp(utf8name, "packageType")) {
             *result = CreateNapiValue(napi_number, &testEnv->pakcageInfo.result[0].packageType);
-        } else if (strcmp(utf8name, "size") == 0) {
+        } else if (!strcmp(utf8name, "size")) {
             *result = CreateNapiValue(napi_bigint, &testEnv->pakcageInfo.result[0].size);
         }
     } else if (testValue->GetType() == TEST_NVALUE_TYPE_UPDATE_POLICY) {
-        if (strcmp(utf8name, "autoDownload") == 0) {
+        if (!strcmp(utf8name, "autoDownload")) {
             *result = CreateNapiValue(napi_number, (void*)&g_updatePolicy.autoDownload);
-        } else if (strcmp(utf8name, "autoDownloadNet") == 0) {
+        } else if (!strcmp(utf8name, "autoDownloadNet")) {
             *result = CreateNapiValue(napi_string, (void*)&g_updatePolicy.autoDownloadNet);
-        } else if (strcmp(utf8name, "mode") == 0) {
+        } else if (!strcmp(utf8name, "mode")) {
             *result = CreateNapiValue(napi_string, (void*)&g_updatePolicy.mode);
-        } else if (strcmp(utf8name, "autoUpgradeCondition") == 0) {
+        } else if (!strcmp(utf8name, "autoUpgradeCondition")) {
             *result = CreateNapiValue(napi_string, (void*)&g_updatePolicy.autoUpgradeCondition);
         }
     }
@@ -288,7 +290,7 @@ napi_status napi_get_value_string_utf8(napi_env env, napi_value value, char* buf
 {
     TestNApiValue* testValue = (TestNApiValue*)value;
     if (buf != nullptr) {
-        memcpy_s(buf, bufsize, testValue->strValue.data(), testValue->strValue.size());
+        (void)memcpy_s(buf, bufsize, testValue->strValue.data(), testValue->strValue.size());
     }
     printf("napi_get_value_string_utf8 %s bufsize %zu  %zu \n",
         testValue->strValue.c_str(), bufsize, testValue->strValue.size());
@@ -313,7 +315,9 @@ napi_status napi_get_value_uint32(napi_env env, napi_value value, uint32_t* resu
 napi_status napi_get_value_int64(napi_env env, napi_value value, int64_t* result)
 {
     TestNApiValue* testValue = (TestNApiValue*)value;
-    *result = testValue->int64Value;
+    if (result != nullptr) {
+        *result = testValue->int64Value;
+    }
     return napi_status::napi_ok;
 }
 
@@ -329,29 +333,29 @@ napi_status napi_set_named_property(napi_env env, napi_value object, const char
         if (testValue->strValue.empty()) {
             return napi_status::napi_ok;
         }
-        if (strcmp(utf8name, "versionName") == 0) {
+        if (!strcmp(utf8name, "versionName")) {
             testEnv->pakcageInfo.result[0].versionName = testValue->strValue;
-        } else if (strcmp(utf8name, "versionCode") == 0) {
+        } else if (!strcmp(utf8name, "versionCode")) {
             testEnv->pakcageInfo.result[0].versionCode = testValue->strValue;
-        } else if (strcmp(utf8name, "verifyInfo") == 0) {
+        } else if (!strcmp(utf8name, "verifyInfo")) {
             testEnv->pakcageInfo.result[0].verifyInfo = testValue->strValue;
-        } else if (strcmp(utf8name, "descriptPackageId") == 0) {
+        } else if (!strcmp(utf8name, "descriptPackageId")) {
             if (testValue->strValue.size() > 0) {
                 testEnv->pakcageInfo.result[0].descriptPackageId = testValue->strValue;
             }
-        } else if (strcmp(utf8name, "errMsg") == 0) {
+        } else if (!strcmp(utf8name, "errMsg")) {
             testEnv->errorMsg = testValue->strValue;
         }
     } else if (testValue->GetType() == napi_number) {
-        if (strcmp(utf8name, "packageType") == 0) {
+        if (!strcmp(utf8name, "packageType")) {
             testEnv->pakcageInfo.result[0].packageType = (PackageType)testValue->intValue;
-        } else if (strcmp(utf8name, "status") == 0) {
+        } else if (!strcmp(utf8name, "status")) {
             testEnv->progress.status = (UpgradeStatus)testValue->intValue;
-        } else if (strcmp(utf8name, "percent") == 0) {
+        } else if (!strcmp(utf8name, "percent")) {
             testEnv->progress.percent = testValue->intValue;
         }
     } else if (testValue->GetType() == napi_bigint) {
-        if (strcmp(utf8name, "size") == 0 && testValue->int64Value != 0) {
+        if (strcmp(utf8name, "size") == 0 && testValue->int64Value) {
             testEnv->pakcageInfo.result[0].size = (size_t)testValue->int64Value;
         }
     }
@@ -384,7 +388,7 @@ napi_status napi_get_cb_info(
     switch (testEnv->testStage) {
         case SESSION_GET_UPDATER: {
             if (*argc > 1) {
-                *argc = (testEnv->engineType != 0) ? NUMBER_2 : 1;
+                *argc = (testEnv->engineType) ? NUMBER_2 : 1;
                 argv[0] = CreateNapiValue(napi_string, testEnv->eventType.c_str());
                 argv[1] = CreateNapiValue(napi_string, "OTA");
             } else {
@@ -429,7 +433,9 @@ napi_status napi_get_cb_info(
 
 napi_status napi_is_array(napi_env env, napi_value value, bool *result)
 {
-    *result = true;
+    if (result != nullptr) {
+        *result = true;
+    }
     return napi_status::napi_ok;
 }
 
@@ -456,6 +462,7 @@ napi_status napi_open_handle_scope(napi_env env, napi_handle_scope* result)
 
 napi_status napi_close_handle_scope(napi_env env, napi_handle_scope scope)
 {
+    UNUSED(env);
     return napi_status::napi_ok;
 }
 
@@ -520,11 +527,13 @@ napi_status napi_define_class(napi_env env, const char* utf8name, size_t length,
 napi_status napi_new_instance(napi_env env, napi_value constructor, size_t argc, const napi_value* argv,
     napi_value* result)
 {
+    UNUSED(argv);
     return napi_status::napi_ok;
 }
 
 napi_status napi_remove_wrap(napi_env env, napi_value js_object, void** result)
 {
+    UNUSED(result);
     return napi_status::napi_ok;
 }
 
diff --git a/test/unittest/update_engine/server_unittest.cpp b/test/unittest/update_engine/server_unittest.cpp
index ca149143..657d213d 100644
--- a/test/unittest/update_engine/server_unittest.cpp
+++ b/test/unittest/update_engine/server_unittest.cpp
@@ -71,6 +71,7 @@ public:
     virtual ~UpdateServerTest()
     {
         delete updateCallBack_;
+        updateCallBack_ = nullptr;
     }
 
     void SetUp() {}
@@ -536,9 +537,9 @@ HWTEST_F(UpdateServerTest, TestKitsResetService, TestSize.Level1)
     sptr<IRemoteObject> remoteObj = systemMgr->GetSystemAbility(UPDATE_DISTRIBUTED_SERVICE_ID);
     EXPECT_NE(remoteObj, nullptr);
     sptr<IRemoteObject::DeathRecipient> deathRecipient = new UpdateServiceKitsImpl::DeathRecipient();
-    deathRecipient->OnRemoteDied(remoteObj);
     EXPECT_NE(deathRecipient, nullptr);
-    UpdateService *saServer = new UpdateService(0, true);
+    deathRecipient->OnRemoteDied(remoteObj);
+    UpdateService *saServer = new (std::nothrow)UpdateService(0, true);
     EXPECT_NE(saServer, nullptr);
     const std::string miscFile = "/dev/block/platform/soc/10100000.himci.eMMC/by-name/misc";
     const std::string packageName = "--update_package=/data/updater/updater.zip";
@@ -552,9 +553,9 @@ HWTEST_F(UpdateServerTest, TestKitsRemoteCallbackOnCheckVersionDone, TestSize.Le
     VersionInfo info {};
     UpdateCallbackInfo callBackFun {};
     sptr<UpdateServiceKitsImpl::RemoteUpdateCallback> remoteCallBack =
-        new UpdateServiceKitsImpl::RemoteUpdateCallback(callBackFun);
-    remoteCallBack->OnCheckVersionDone(info);
+        new (std::nothrow)UpdateServiceKitsImpl::RemoteUpdateCallback(callBackFun);
     EXPECT_NE(remoteCallBack, nullptr);
+    remoteCallBack->OnCheckVersionDone(info);
 }
 
 HWTEST_F(UpdateServerTest, TestKitsRemoteCallbackOnDownloadProgress, TestSize.Level1)
@@ -562,9 +563,9 @@ HWTEST_F(UpdateServerTest, TestKitsRemoteCallbackOnDownloadProgress, TestSize.Le
     Progress progress {};
     UpdateCallbackInfo callBackFun {};
     sptr<UpdateServiceKitsImpl::RemoteUpdateCallback> remoteCallBack =
-        new UpdateServiceKitsImpl::RemoteUpdateCallback(callBackFun);
-    remoteCallBack->OnDownloadProgress(progress);
+        new (std::nothrow)UpdateServiceKitsImpl::RemoteUpdateCallback(callBackFun);
     EXPECT_NE(remoteCallBack, nullptr);
+    remoteCallBack->OnDownloadProgress(progress);
 }
 
 HWTEST_F(UpdateServerTest, TestKitsRemoteCallbackOnUpgradeProgress, TestSize.Level1)
@@ -572,9 +573,9 @@ HWTEST_F(UpdateServerTest, TestKitsRemoteCallbackOnUpgradeProgress, TestSize.Lev
     Progress progress {};
     UpdateCallbackInfo callBackFun {};
     sptr<UpdateServiceKitsImpl::RemoteUpdateCallback> remoteCallBack =
-        new UpdateServiceKitsImpl::RemoteUpdateCallback(callBackFun);
-    remoteCallBack->OnUpgradeProgress(progress);
+        new (std::nothrow)UpdateServiceKitsImpl::RemoteUpdateCallback(callBackFun);
     EXPECT_NE(remoteCallBack, nullptr);
+    remoteCallBack->OnUpgradeProgress(progress);
 }
 
 HWTEST_F(UpdateServerTest, TestKitsRegisterUpdateCallback, TestSize.Level1)
@@ -611,7 +612,7 @@ HWTEST_F(UpdateServerTest, TestKitsRebootAndClean, TestSize.Level1)
 HWTEST_F(UpdateServerTest, TestKitsReadDataFromSSL, TestSize.Level1)
 {
     int32_t engineSocket = 10;
-    UpdateService *updateServer = new UpdateService(0, true);
+    UpdateService *updateServer = new (std::nothrow)UpdateService(0, true);
     EXPECT_NE(updateServer, nullptr);
     updateServer->ReadDataFromSSL(engineSocket);
     delete updateServer;
@@ -619,7 +620,7 @@ HWTEST_F(UpdateServerTest, TestKitsReadDataFromSSL, TestSize.Level1)
 
 HWTEST_F(UpdateServerTest, TestKits, TestSize.Level1)
 {
-    UpdateServiceKits *kit = new MockUpdateServiceKits();
+    UpdateServiceKits *kit = new (std::nothrow)MockUpdateServiceKits();
     EXPECT_NE(kit, nullptr);
     delete kit;
 }
@@ -635,7 +636,8 @@ HWTEST_F(UpdateServerTest, TestUpdateServiceKitsImpl, TestSize.Level1)
 HWTEST_F(UpdateServerTest, TestUpdateServiceRegisterUpdateCallback, TestSize.Level1)
 {
     UpdateContext ctx {};
-    UpdateService *updateServer = new UpdateService(0, true);
+    UpdateService *updateServer = new (std::nothrow)UpdateService(0, true);
+    EXPECT_NE(updateServer, nullptr);
     updateServer->RegisterUpdateCallback(ctx, nullptr);
     delete updateServer;
 }
@@ -644,7 +646,7 @@ HWTEST_F(UpdateServerTest, TestVerifyDownloadPkg, TestSize.Level1)
 {
     Progress downloadProgress {};
     std::string path = "/data/updater/updater/test.txt";
-    UpdateService *updateServer = new UpdateService(0, true);
+    UpdateService *updateServer = new (std::nothrow)UpdateService(0, true);
     EXPECT_NE(updateServer, nullptr);
     updateServer->VerifyDownloadPkg(path, downloadProgress);
     delete updateServer;
-- 
Gitee