From 44f63f6f845bf08c970c0592478658e3db93fac6 Mon Sep 17 00:00:00 2001
From: zouyousong <332159254@qq.com>
Date: Wed, 23 Mar 2022 15:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E6=BA=90=E5=8D=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=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                      | 27 ++++++++++++-------
 client/update_client.h                        | 11 ++++++++
 .../UpdaterOnRemoteRequest_fuzzer.cpp         |  2 ++
 test/unittest/update_client/client_stub.cpp   | 17 +++++++++---
 .../update_engine/server_unittest.cpp         | 26 +++++++++---------
 6 files changed, 62 insertions(+), 30 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..41c028fd 100644
--- a/client/update_client.cpp
+++ b/client/update_client.cpp
@@ -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,
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/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..b65e37e1 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;
 }
 
@@ -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;
 }
 
@@ -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