diff --git a/interfaces/inner_api/el5filekeymanager/test/unittest/src/el5_filekey_manager_kit_unittest.cpp b/interfaces/inner_api/el5filekeymanager/test/unittest/src/el5_filekey_manager_kit_unittest.cpp index 9dcf219fd7bc5f647b93f735abebbc44d8ee8a97..32fba8a1199ff683305a2e332a0c0e94dda48fda 100644 --- a/interfaces/inner_api/el5filekeymanager/test/unittest/src/el5_filekey_manager_kit_unittest.cpp +++ b/interfaces/inner_api/el5filekeymanager/test/unittest/src/el5_filekey_manager_kit_unittest.cpp @@ -191,7 +191,7 @@ HWTEST_F(El5FilekeyManagerKitTest, SetFilePathPolicy001, TestSize.Level1) */ HWTEST_F(El5FilekeyManagerKitTest, RegisterCallback001, TestSize.Level1) { - ASSERT_NE(El5FilekeyManagerKit::RegisterCallback((new TestEl5FilekeyCallback())), EFM_SUCCESS); + ASSERT_NE(El5FilekeyManagerKit::RegisterCallback((new (std::nothrow) TestEl5FilekeyCallback())), EFM_SUCCESS); } /** diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp index 01c325b4d795fbb0b2f6a73c9d076a3da53e4b22..1f35651ae13321fa52e089496fc7d9163292ac40 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp @@ -51,7 +51,7 @@ AccessTokenManagerClient& AccessTokenManagerClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - AccessTokenManagerClient* tmp = new AccessTokenManagerClient(); + AccessTokenManagerClient* tmp = new (std::nothrow) AccessTokenManagerClient(); instance = std::move(tmp); } } @@ -917,7 +917,7 @@ int32_t AccessTokenManagerClient::RegisterTokenSyncCallback( return AccessTokenError::ERR_PARAM_INVALID; } - sptr callback = sptr(new TokenSyncCallback(syncCallback)); + sptr callback = sptr(new (std::nothrow) TokenSyncCallback(syncCallback)); std::lock_guard lock(tokenSyncCallbackMutex_); int32_t res = proxy->RegisterTokenSyncCallback(callback->AsObject()); @@ -1006,7 +1006,7 @@ void AccessTokenManagerClient::InitProxy() if (serviceDeathObserver_ != nullptr) { accesstokenSa->AddDeathRecipient(serviceDeathObserver_); } - proxy_ = new AccessTokenManagerProxy(accesstokenSa); + proxy_ = new (std::nothrow) AccessTokenManagerProxy(accesstokenSa); if (proxy_ == nullptr || proxy_->AsObject() == nullptr || proxy_->AsObject()->IsObjectDead()) { LOGE(ATM_DOMAIN, ATM_TAG, "Iface_cast get null"); } diff --git a/interfaces/innerkits/accesstoken/test/mock/src/iservice_registry.cpp b/interfaces/innerkits/accesstoken/test/mock/src/iservice_registry.cpp index 3cd3bac8e42114aee7f40387661a012759cbd4cb..35e2ff3b3a58b4d3f37761482823efb754dd3793 100644 --- a/interfaces/innerkits/accesstoken/test/mock/src/iservice_registry.cpp +++ b/interfaces/innerkits/accesstoken/test/mock/src/iservice_registry.cpp @@ -18,7 +18,7 @@ namespace OHOS { SystemAbilityManagerClient& SystemAbilityManagerClient::GetInstance() { - static auto instance = new SystemAbilityManagerClient(); + static auto instance = new (std::nothrow) SystemAbilityManagerClient(); return *instance; } diff --git a/interfaces/innerkits/accesstoken/test/tool/grant_short_term_write_imagevideo.cpp b/interfaces/innerkits/accesstoken/test/tool/grant_short_term_write_imagevideo.cpp index 134d617e648b69ca2c82331dbef516ed20c231d0..67d7da3f243318bfea2e90708ba3885c335499d7 100644 --- a/interfaces/innerkits/accesstoken/test/tool/grant_short_term_write_imagevideo.cpp +++ b/interfaces/innerkits/accesstoken/test/tool/grant_short_term_write_imagevideo.cpp @@ -28,7 +28,7 @@ using namespace OHOS::Security::AccessToken; static void NativeTokenGet() { uint64_t tokenID; - const char **perms = new const char *[1]; // size of array + const char **perms = new (std::nothrow) const char *[1]; // size of array perms[0] = "ohos.permission.GRANT_SHORT_TERM_WRITE_MEDIAVIDEO"; // 0: index NativeTokenInfoParams infoInstance = { diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp index 2b59b1da16ff9dea5876fe47e2d38019171245c5..252571abf1bcc9afb824a2eed5f095f3c531a69e 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp @@ -37,7 +37,7 @@ PrivacyManagerClient& PrivacyManagerClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - PrivacyManagerClient* tmp = new PrivacyManagerClient(); + PrivacyManagerClient* tmp = new (std::nothrow) PrivacyManagerClient(); instance = std::move(tmp); } } @@ -416,7 +416,7 @@ void PrivacyManagerClient::InitProxy() if (serviceDeathObserver_ != nullptr) { privacySa->AddDeathRecipient(serviceDeathObserver_); } - proxy_ = new PrivacyManagerProxy(privacySa); + proxy_ = new (std::nothrow) PrivacyManagerProxy(privacySa); if (proxy_ == nullptr || proxy_->AsObject() == nullptr || proxy_->AsObject()->IsObjectDead()) { LOGE(PRI_DOMAIN, PRI_TAG, "Iface_cast get null"); } diff --git a/interfaces/innerkits/privacy/test/mock/src/iservice_registry.cpp b/interfaces/innerkits/privacy/test/mock/src/iservice_registry.cpp index 3cd3bac8e42114aee7f40387661a012759cbd4cb..35e2ff3b3a58b4d3f37761482823efb754dd3793 100644 --- a/interfaces/innerkits/privacy/test/mock/src/iservice_registry.cpp +++ b/interfaces/innerkits/privacy/test/mock/src/iservice_registry.cpp @@ -18,7 +18,7 @@ namespace OHOS { SystemAbilityManagerClient& SystemAbilityManagerClient::GetInstance() { - static auto instance = new SystemAbilityManagerClient(); + static auto instance = new (std::nothrow) SystemAbilityManagerClient(); return *instance; } diff --git a/interfaces/innerkits/privacy/test/tool/add_permission_used_record.cpp b/interfaces/innerkits/privacy/test/tool/add_permission_used_record.cpp index a9129820ced62ba9b4967e0a407473b6d9be1967..4036b65790dd03459f92236d19a814a550901e1c 100644 --- a/interfaces/innerkits/privacy/test/tool/add_permission_used_record.cpp +++ b/interfaces/innerkits/privacy/test/tool/add_permission_used_record.cpp @@ -28,7 +28,7 @@ using namespace OHOS::Security::AccessToken; static void NativeTokenGet() { uint64_t tokenID; - const char **perms = new const char *[1]; // size of array + const char **perms = new (std::nothrow) const char *[1]; // size of array perms[0] = "ohos.permission.PERMISSION_USED_STATS"; // 0: index NativeTokenInfoParams infoInstance = { diff --git a/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp b/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp index 84a1a1f020542bd1a1abee31871ccdd9f43baad6..46e8a18fe9fc33fc4c6108d77e8f6aea4bb5d2df 100644 --- a/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp +++ b/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp @@ -32,7 +32,7 @@ AppManagerAccessClient& AppManagerAccessClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - AppManagerAccessClient* tmp = new AppManagerAccessClient(); + AppManagerAccessClient* tmp = new (std::nothrow) AppManagerAccessClient(); instance = std::move(tmp); } } @@ -72,7 +72,7 @@ void AppManagerAccessClient::InitProxy() return; } - proxy_ = new AppManagerAccessProxy(appManagerSa); + proxy_ = new (std::nothrow) AppManagerAccessProxy(appManagerSa); if (proxy_ == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "Iface_cast get null"); } diff --git a/interfaces/innerkits/privacy/test/unittest/src/permission_deny_test.cpp b/interfaces/innerkits/privacy/test/unittest/src/permission_deny_test.cpp index 65d5386c92a1cddbbe8cad36578e179f39668bab..243bf63bc7044bb5db31491c5427b0567e0b7c44 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/permission_deny_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/permission_deny_test.cpp @@ -151,7 +151,7 @@ HWTEST_F(PermDenyTest, GetPermissionUsedRecords001, TestSize.Level0) PermissionUsedResult result; ASSERT_EQ(PrivacyError::ERR_PERMISSION_DENIED, PrivacyKit::GetPermissionUsedRecords(request, result)); - OHOS::sptr callback(new TestCallBack()); + OHOS::sptr callback(new (std::nothrow) TestCallBack()); ASSERT_EQ(PrivacyError::ERR_PERMISSION_DENIED, PrivacyKit::GetPermissionUsedRecords(request, callback)); } diff --git a/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp b/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp index 3df4841c86174fdf0ea68ed3cbfa0ed26ec6f766..6ffd9f19f2b1b9b0c407d73392c4bf66af28187f 100644 --- a/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp +++ b/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp @@ -33,7 +33,7 @@ TokenSyncManagerClient& TokenSyncManagerClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - TokenSyncManagerClient* tmp = new TokenSyncManagerClient(); + TokenSyncManagerClient* tmp = new (std::nothrow) TokenSyncManagerClient(); instance = std::move(tmp); } } @@ -96,7 +96,7 @@ sptr TokenSyncManagerClient::GetProxy() const return nullptr; } - auto proxy = new TokenSyncManagerProxy(tokensyncSa); + auto proxy = new (std::nothrow) TokenSyncManagerProxy(tokensyncSa); if (proxy == nullptr) { LOGW(ATM_DOMAIN, ATM_TAG, "Iface_cast get null"); return nullptr; diff --git a/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h b/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h index bff43d416d4796c173b37b86dbd266054a2c4233..72303a3776abdb8151ce2ebfbfca0989029549ac 100644 --- a/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h +++ b/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h @@ -41,7 +41,7 @@ public: void NotifyTokenSyncTask(); int32_t GetRemoteHapTokenInfo(const std::string& deviceID, AccessTokenID tokenID); int32_t RegisterTokenSyncCallback(const sptr& callback); - int32_t UnRegisterTokenSyncCallback(); + void UnRegisterTokenSyncCallback(); private: TokenModifyNotifier(); diff --git a/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp b/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp index a5bb529082a5d444471a0e6689c3f65d2286f2cc..fdf1381eda28b1c85ab8773bd9298cd8bd913bd9 100644 --- a/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp @@ -40,7 +40,7 @@ CallbackManager& CallbackManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - CallbackManager* tmp = new CallbackManager(); + CallbackManager* tmp = new (std::nothrow) CallbackManager(); instance = std::move(tmp); } } @@ -130,7 +130,7 @@ void CallbackManager::ExecuteAllCallback(std::vector>& list, const std::string& permName, int32_t changeType) { for (auto it = list.begin(); it != list.end(); ++it) { - sptr callback = new PermissionStateChangeCallbackProxy(*it); + sptr callback = new (std::nothrow) PermissionStateChangeCallbackProxy(*it); if (callback != nullptr) { LOGI(ATM_DOMAIN, ATM_TAG, "Callback execute"); PermStateChangeInfo resInfo; diff --git a/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp b/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp index 73e2f2572556b1f9b229fb1aab6e9d5deb6a74a3..b7c17073d5eb5b686e2f26e42522edc988e3f3ae 100644 --- a/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp +++ b/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp @@ -42,7 +42,7 @@ AccessTokenDb& AccessTokenDb::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - AccessTokenDb* tmp = new AccessTokenDb(); + AccessTokenDb* tmp = new (std::nothrow) AccessTokenDb(); instance = std::move(tmp); } } diff --git a/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp b/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp index b7b26361447d5c556a7711fba5ecb8ca0f42fc84..14b6f58da1e60a7941cb1f8eb236a0e405421fae 100644 --- a/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp +++ b/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp @@ -32,7 +32,7 @@ FormManagerAccessClient& FormManagerAccessClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - FormManagerAccessClient* tmp = new FormManagerAccessClient(); + FormManagerAccessClient* tmp = new (std::nothrow) FormManagerAccessClient(); instance = std::move(tmp); } } @@ -107,7 +107,7 @@ void FormManagerAccessClient::InitProxy() formManagerSa->AddDeathRecipient(serviceDeathObserver_); } - proxy_ = new FormManagerAccessProxy(formManagerSa); + proxy_ = new (std::nothrow) FormManagerAccessProxy(formManagerSa); if (proxy_ == nullptr || proxy_->AsObject() == nullptr || proxy_->AsObject()->IsObjectDead()) { LOGE(ATM_DOMAIN, ATM_TAG, "Iface_cast get null."); } diff --git a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp index a78ccefb4d7bdf83defdd8d2073c0fdbb900e6c0..a0f7a7a3e45823bf2475bc8f8ea935aeee33f05f 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp @@ -36,7 +36,7 @@ DlpPermissionSetManager& DlpPermissionSetManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - DlpPermissionSetManager* tmp = new DlpPermissionSetManager(); + DlpPermissionSetManager* tmp = new (std::nothrow) DlpPermissionSetManager(); instance = std::move(tmp); } } diff --git a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp index 0dcb9012bd18afaec3cf0acd9d1de7ffbafb5b04..66554b8e72a38df66e3eef04d28b8d6ccb19673c 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp @@ -42,7 +42,7 @@ ShortGrantManager& ShortGrantManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - ShortGrantManager* tmp = new ShortGrantManager(); + ShortGrantManager* tmp = new (std::nothrow) ShortGrantManager(); instance = std::move(tmp); } } diff --git a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp index bcce7368dcc94bd7bc67c4a30b3373ab901e0024..a5fb9be593e4960dd7fcd62acd263eadc5f18158 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp @@ -59,7 +59,7 @@ TempPermissionObserver& TempPermissionObserver::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - TempPermissionObserver* tmp = new TempPermissionObserver(); + TempPermissionObserver* tmp = new (std::nothrow) TempPermissionObserver(); instance = std::move(tmp); } } diff --git a/services/accesstokenmanager/main/cpp/src/seccomp/sec_comp_enhance_agent.cpp b/services/accesstokenmanager/main/cpp/src/seccomp/sec_comp_enhance_agent.cpp index 5359bc3b4f7b9ca54e8dd9a3f51000605cdb3243..077dc473532905db3374275a64694194457a774b 100644 --- a/services/accesstokenmanager/main/cpp/src/seccomp/sec_comp_enhance_agent.cpp +++ b/services/accesstokenmanager/main/cpp/src/seccomp/sec_comp_enhance_agent.cpp @@ -35,7 +35,7 @@ SecCompEnhanceAgent& SecCompEnhanceAgent::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - SecCompEnhanceAgent* tmp = new SecCompEnhanceAgent(); + SecCompEnhanceAgent* tmp = new (std::nothrow) SecCompEnhanceAgent(); instance = std::move(tmp); } } diff --git a/services/accesstokenmanager/main/cpp/src/seccomp/sec_comp_monitor.cpp b/services/accesstokenmanager/main/cpp/src/seccomp/sec_comp_monitor.cpp index 1248b5f9b6b653ff2ec835548d50e04e125661ac..9686930e656fef3204d54f96a6142baa4be6c751 100644 --- a/services/accesstokenmanager/main/cpp/src/seccomp/sec_comp_monitor.cpp +++ b/services/accesstokenmanager/main/cpp/src/seccomp/sec_comp_monitor.cpp @@ -102,7 +102,7 @@ SecCompMonitor& SecCompMonitor::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - SecCompMonitor* tmp = new SecCompMonitor(); + SecCompMonitor* tmp = new (std::nothrow) SecCompMonitor(); instance = std::move(tmp); } } diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp index 75f4002abff1a8de09f67deb9a118b02be85d24b..b4a33356047cd9b48c668bbafadaa14e6324fd30 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp @@ -1125,7 +1125,8 @@ int32_t AccessTokenManagerService::UnRegisterTokenSyncCallback() LOGE(ATM_DOMAIN, ATM_TAG, "Permission denied, tokenID=%{public}d", IPCSkeleton::GetCallingTokenID()); return AccessTokenError::ERR_PERMISSION_DENIED; } - return TokenModifyNotifier::GetInstance().UnRegisterTokenSyncCallback(); + TokenModifyNotifier::GetInstance().UnRegisterTokenSyncCallback(); + return ERR_OK; } #endif diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp index 3e4883d072e3d079ad7255b92c53dfde35af5e3f..0355c17c352ba155b309d8698c8b86adb000915f 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp @@ -1019,7 +1019,7 @@ AccessTokenInfoManager& AccessTokenInfoManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - AccessTokenInfoManager* tmp = new AccessTokenInfoManager(); + AccessTokenInfoManager* tmp = new (std::nothrow) AccessTokenInfoManager(); instance = std::move(tmp); } } diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp index 9f80281e046528af43c6d3223535dba8ca538249..855fd6335415f84bdaa9a61b31011b1cd6aefaec 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp @@ -39,7 +39,7 @@ AccessTokenRemoteTokenManager& AccessTokenRemoteTokenManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - AccessTokenRemoteTokenManager* tmp = new AccessTokenRemoteTokenManager(); + AccessTokenRemoteTokenManager* tmp = new (std::nothrow) AccessTokenRemoteTokenManager(); instance = std::move(tmp); } } diff --git a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp index 1592e423ebe0607cb7fa2465d0190145aab22b90..e4b74f2e79fb8267c7af4bbd891990b0d205a0b8 100644 --- a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp @@ -84,7 +84,7 @@ TokenModifyNotifier& TokenModifyNotifier::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - TokenModifyNotifier* tmp = new TokenModifyNotifier(); + TokenModifyNotifier* tmp = new (std::nothrow) TokenModifyNotifier(); instance = std::move(tmp); } } @@ -175,14 +175,17 @@ int32_t TokenModifyNotifier::GetRemoteHapTokenInfo(const std::string& deviceID, int32_t TokenModifyNotifier::RegisterTokenSyncCallback(const sptr& callback) { Utils::UniqueWriteGuard infoGuard(this->notifyLock_); - tokenSyncCallbackObject_ = new TokenSyncCallbackProxy(callback); + tokenSyncCallbackObject_ = new (std::nothrow) TokenSyncCallbackProxy(callback); tokenSyncCallbackDeathRecipient_ = sptr::MakeSptr(); + if (tokenSyncCallbackDeathRecipient_ == nullptr) { + return RET_FAILED; + } callback->AddDeathRecipient(tokenSyncCallbackDeathRecipient_); LOGI(ATM_DOMAIN, ATM_TAG, "Register token sync callback successful."); return ERR_OK; } -int32_t TokenModifyNotifier::UnRegisterTokenSyncCallback() +void TokenModifyNotifier::UnRegisterTokenSyncCallback() { Utils::UniqueWriteGuard infoGuard(this->notifyLock_); if (tokenSyncCallbackObject_ != nullptr && tokenSyncCallbackDeathRecipient_ != nullptr) { @@ -191,7 +194,6 @@ int32_t TokenModifyNotifier::UnRegisterTokenSyncCallback() tokenSyncCallbackObject_ = nullptr; tokenSyncCallbackDeathRecipient_ = nullptr; LOGI(ATM_DOMAIN, ATM_TAG, "Unregister token sync callback successful."); - return ERR_OK; } void TokenModifyNotifier::NotifyTokenChangedIfNeed() diff --git a/services/accesstokenmanager/test/mock/library_loader_mock.cpp b/services/accesstokenmanager/test/mock/library_loader_mock.cpp index 692d976d36c886b2a117ab87b1a1e34c7c92efe5..af81e6ef296fe9c695cd4f4bb8012381600a289b 100644 --- a/services/accesstokenmanager/test/mock/library_loader_mock.cpp +++ b/services/accesstokenmanager/test/mock/library_loader_mock.cpp @@ -46,7 +46,7 @@ int32_t AbilityManagerAccessLoaderMock::KillProcessForPermissionUpdate(uint32_t LibraryLoader::LibraryLoader(const std::string& path) { - instance_ = new AbilityManagerAccessLoaderMock(); + instance_ = new (std::nothrow) AbilityManagerAccessLoaderMock(); handle_ = nullptr; } diff --git a/services/common/background_task_manager/src/background_task_manager_access_client.cpp b/services/common/background_task_manager/src/background_task_manager_access_client.cpp index 7ae32486c87848365055339f1596c1d25ed3d480..dde27eedc1109692181fe6a35089933544b0c891 100644 --- a/services/common/background_task_manager/src/background_task_manager_access_client.cpp +++ b/services/common/background_task_manager/src/background_task_manager_access_client.cpp @@ -32,7 +32,7 @@ BackgourndTaskManagerAccessClient& BackgourndTaskManagerAccessClient::GetInstanc if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - BackgourndTaskManagerAccessClient* tmp = new BackgourndTaskManagerAccessClient(); + BackgourndTaskManagerAccessClient* tmp = new (std::nothrow) BackgourndTaskManagerAccessClient(); instance = std::move(tmp); } } @@ -106,7 +106,7 @@ void BackgourndTaskManagerAccessClient::InitProxy() backgroundTaskManagerSa->AddDeathRecipient(serviceDeathObserver_); } - proxy_ = new BackgroundTaskManagerAccessProxy(backgroundTaskManagerSa); + proxy_ = new (std::nothrow) BackgroundTaskManagerAccessProxy(backgroundTaskManagerSa); if (proxy_ == nullptr || proxy_->AsObject() == nullptr || proxy_->AsObject()->IsObjectDead()) { LOGE(ATM_DOMAIN, ATM_TAG, "Iface_cast get null"); } diff --git a/services/common/window_manager/src/privacy_window_manager_client.cpp b/services/common/window_manager/src/privacy_window_manager_client.cpp index e005d9039ab45d22938ab295b4637f163917ef93..33f4784e0feca582ba856174545a5ff307dcc0aa 100644 --- a/services/common/window_manager/src/privacy_window_manager_client.cpp +++ b/services/common/window_manager/src/privacy_window_manager_client.cpp @@ -41,7 +41,7 @@ PrivacyWindowManagerClient& PrivacyWindowManagerClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - PrivacyWindowManagerClient* tmp = new PrivacyWindowManagerClient(); + PrivacyWindowManagerClient* tmp = new (std::nothrow) PrivacyWindowManagerClient(); instance = std::move(tmp); } } @@ -134,7 +134,7 @@ void PrivacyWindowManagerClient::InitSessionManagerServiceProxy() LOGE(PRI_DOMAIN, PRI_TAG, "Remote object is nullptr"); return; } - mockSessionManagerServiceProxy_ = new PrivacyMockSessionManagerProxy(remoteObject); + mockSessionManagerServiceProxy_ = new (std::nothrow) PrivacyMockSessionManagerProxy(remoteObject); if (!mockSessionManagerServiceProxy_ || mockSessionManagerServiceProxy_->AsObject() == nullptr || mockSessionManagerServiceProxy_->AsObject()->IsObjectDead()) { LOGW(PRI_DOMAIN, PRI_TAG, "Get mock session manager service proxy failed, nullptr"); @@ -145,7 +145,7 @@ void PrivacyWindowManagerClient::InitSessionManagerServiceProxy() LOGE(PRI_DOMAIN, PRI_TAG, "Remote object2 is nullptr"); return; } - sessionManagerServiceProxy_ = new PrivacySessionManagerProxy(remoteObject2); + sessionManagerServiceProxy_ = new (std::nothrow) PrivacySessionManagerProxy(remoteObject2); if (!sessionManagerServiceProxy_ || sessionManagerServiceProxy_->AsObject() == nullptr || sessionManagerServiceProxy_->AsObject()->IsObjectDead()) { LOGE(PRI_DOMAIN, PRI_TAG, "SessionManagerServiceProxy_ is nullptr"); @@ -169,7 +169,7 @@ void PrivacyWindowManagerClient::InitSceneSessionManagerProxy() LOGW(PRI_DOMAIN, PRI_TAG, "Get scene session manager proxy failed, scene session manager service is null"); return; } - sceneSessionManagerProxy_ = new PrivacySceneSessionManagerProxy(remoteObject); + sceneSessionManagerProxy_ = new (std::nothrow) PrivacySceneSessionManagerProxy(remoteObject); if (sceneSessionManagerProxy_ == nullptr || sceneSessionManagerProxy_->AsObject() == nullptr || sceneSessionManagerProxy_->AsObject()->IsObjectDead()) { LOGW(PRI_DOMAIN, PRI_TAG, "SceneSessionManagerProxy_ is null."); @@ -202,7 +202,7 @@ void PrivacyWindowManagerClient::InitSceneSessionManagerLiteProxy() LOGW(PRI_DOMAIN, PRI_TAG, "Get scene session manager proxy failed, scene session manager service is null"); return; } - sceneSessionManagerLiteProxy_ = new PrivacySceneSessionManagerLiteProxy(remoteObject); + sceneSessionManagerLiteProxy_ = new (std::nothrow) PrivacySceneSessionManagerLiteProxy(remoteObject); if (sceneSessionManagerLiteProxy_ == nullptr || sceneSessionManagerLiteProxy_->AsObject() == nullptr || sceneSessionManagerLiteProxy_->AsObject()->IsObjectDead()) { LOGW(PRI_DOMAIN, PRI_TAG, "SceneSessionManagerLiteProxy_ is null."); @@ -256,7 +256,7 @@ void PrivacyWindowManagerClient::InitWMSProxy() windowManagerSa->AddDeathRecipient(serviceDeathObserver_); } - wmsProxy_ = new PrivacyWindowManagerProxy(windowManagerSa); + wmsProxy_ = new (std::nothrow) PrivacyWindowManagerProxy(windowManagerSa); if (wmsProxy_ == nullptr || wmsProxy_->AsObject() == nullptr || wmsProxy_->AsObject()->IsObjectDead()) { LOGE(PRI_DOMAIN, PRI_TAG, "WmsProxy_ is null."); return; diff --git a/services/privacymanager/src/active/active_status_callback_manager.cpp b/services/privacymanager/src/active/active_status_callback_manager.cpp index c202535d632ce6480234c28a3e266f7432c08af3..214eba50ffae787f74f9a2a3870effa6c515d845 100644 --- a/services/privacymanager/src/active/active_status_callback_manager.cpp +++ b/services/privacymanager/src/active/active_status_callback_manager.cpp @@ -39,7 +39,7 @@ ActiveStatusCallbackManager& ActiveStatusCallbackManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - ActiveStatusCallbackManager* tmp = new ActiveStatusCallbackManager(); + ActiveStatusCallbackManager* tmp = new (std::nothrow) ActiveStatusCallbackManager(); instance = std::move(tmp); } } @@ -64,7 +64,7 @@ void ActiveStatusCallbackManager::InitEventHandler(const std::shared_ptr& permList, const sptr& callback) + AccessTokenID registerTokenId, const std::vector& permList, const sptr& callback) { if (callback == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "Input is nullptr"); @@ -82,7 +82,7 @@ int32_t ActiveStatusCallbackManager::AddCallback( } CallbackData recordInstance; - recordInstance.registerTokenId = regiterTokenId; + recordInstance.registerTokenId = registerTokenId; recordInstance.callbackObject_ = callback; recordInstance.permList_ = permList; @@ -142,11 +142,11 @@ void ActiveStatusCallbackManager::ActiveStatusChange(ActiveChangeResponse& info) } } for (auto it = list.begin(); it != list.end(); ++it) { - sptr callback = new PermActiveStatusChangeCallbackProxy(*it); + sptr callback = new (std::nothrow) PermActiveStatusChangeCallbackProxy(*it); if (callback != nullptr) { - LOGI(PRI_DOMAIN, PRI_TAG, "callback execute callingTokenId %{public}u, tokenId %{public}u, " - "permision %{public}s, changeType %{public}d, usedType %{public}d, pid %{public}d", info.callingTokenID, - info.tokenID, info.permissionName.c_str(), info.type, info.usedType, info.pid); + LOGI(PRI_DOMAIN, PRI_TAG, "Callback execute callingTokenId %{public}u, tokenId %{public}u, " + "permission %{public}s, changeType %{public}d, usedType %{public}d, pid %{public}d", + info.callingTokenID, info.tokenID, info.permissionName.c_str(), info.type, info.usedType, info.pid); callback->ActiveStatusChangeCallback(info); } } diff --git a/services/privacymanager/src/database/permission_used_record_db.cpp b/services/privacymanager/src/database/permission_used_record_db.cpp index ab67470a7e2a752da553f402640e991980c88212..a5545f8270b7b2abf66650223a1350b3e9e60865 100644 --- a/services/privacymanager/src/database/permission_used_record_db.cpp +++ b/services/privacymanager/src/database/permission_used_record_db.cpp @@ -44,7 +44,7 @@ PermissionUsedRecordDb& PermissionUsedRecordDb::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - PermissionUsedRecordDb* tmp = new PermissionUsedRecordDb(); + PermissionUsedRecordDb* tmp = new (std::nothrow) PermissionUsedRecordDb(); instance = std::move(tmp); } } diff --git a/services/privacymanager/src/record/permission_record_manager.cpp b/services/privacymanager/src/record/permission_record_manager.cpp index 2e57a7ed5532aa0043f204d19b5cedbee4b23035..92cd94d658539fe4c488c3de7f851b8d8ab01d77 100644 --- a/services/privacymanager/src/record/permission_record_manager.cpp +++ b/services/privacymanager/src/record/permission_record_manager.cpp @@ -83,7 +83,7 @@ PermissionRecordManager& PermissionRecordManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - PermissionRecordManager* tmp = new PermissionRecordManager(); + PermissionRecordManager* tmp = new (std::nothrow) PermissionRecordManager(); instance = std::move(tmp); } } diff --git a/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp b/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp index 62ae2ea2a65a049bad1f96450763d37cc5641c4f..bdcf99a3b985619622b3694cf6c3bddec4a0b189 100644 --- a/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp +++ b/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp @@ -931,7 +931,7 @@ HWTEST_F(PermissionRecordManagerTest, GetPermissionUsedRecordsAsync001, TestSize request.isRemote = false; request.flag = PermissionUsageFlag::FLAG_PERMISSION_USAGE_SUMMARY_IN_SCREEN_LOCKED; - OHOS::sptr cb(new TestUsedRecordCallback()); + OHOS::sptr cb(new (std::nothrow) TestUsedRecordCallback()); EXPECT_EQ(Constant::SUCCESS, PermissionRecordManager::GetInstance().GetPermissionUsedRecordsAsync(request, cb)); } diff --git a/services/privacymanager/test/tool/camera_window_create.cpp b/services/privacymanager/test/tool/camera_window_create.cpp index ff01ea73011560b5b7ebfad502ef5cd5852cca01..bd4861c3da8d0ad6937195a981c626d00a986dee 100644 --- a/services/privacymanager/test/tool/camera_window_create.cpp +++ b/services/privacymanager/test/tool/camera_window_create.cpp @@ -54,14 +54,14 @@ static sptr CreateWindowScene() sptr listener = nullptr; g_abilityContext_ = std::make_shared(); - sptr scene = new Rosen::WindowScene(); + sptr scene = new (std::nothrow) Rosen::WindowScene(); scene->Init(0, g_abilityContext_, listener); return scene; } static sptr CreateAppFloatingWindow(Rosen::WindowType type, Rosen::Rect rect, std::string name = "") { - sptr option = new Rosen::WindowOption(); + sptr option = new (std::nothrow) Rosen::WindowOption(); option->SetWindowType(type); option->SetWindowRect(rect); diff --git a/services/privacymanager/test/unittest/permission_record_manager_test.cpp b/services/privacymanager/test/unittest/permission_record_manager_test.cpp index 710a8d95a90bfbce6fabdde086b158a53c645ea2..27776ced7a535a885102a5ebdfd15915cc487d35 100644 --- a/services/privacymanager/test/unittest/permission_record_manager_test.cpp +++ b/services/privacymanager/test/unittest/permission_record_manager_test.cpp @@ -1241,7 +1241,7 @@ public: void TestDie(int32_t callerPid) { auto map = handler_->proxyStubAndRecipientMap_; - auto param = reinterpret_cast(new PrivacyManagerProxyDeathParam(callerPid)); + auto param = reinterpret_cast(new (std::nothrow) PrivacyManagerProxyDeathParam(callerPid)); for (auto iter = map.begin(); iter != map.end(); ++iter) { if (iter->second.second->IsEqual(param)) { iter->second.first->OnRemoteDied(iter->first); diff --git a/services/test/mock/aafwk/mock_service_registry.cpp b/services/test/mock/aafwk/mock_service_registry.cpp index cbd4f984456776a7f9a45bfb365eed942e42c790..a8b3bc86094f7c424618b1249e016526fc39d8c3 100644 --- a/services/test/mock/aafwk/mock_service_registry.cpp +++ b/services/test/mock/aafwk/mock_service_registry.cpp @@ -40,7 +40,7 @@ void SwitchForeOrBackGround(uint32_t tokenId, int32_t flag) SystemAbilityManagerClient& SystemAbilityManagerClient::GetInstance() { - static auto instance = new SystemAbilityManagerClient(); + static auto instance = new (std::nothrow) SystemAbilityManagerClient(); return *instance; } @@ -55,7 +55,7 @@ sptr SystemAbilityManagerClient::GetSystemAbilityManager( return systemAbilityManager_; } - systemAbilityManager_ = new SystemAbilityManagerProxy(nullptr); + systemAbilityManager_ = new (std::nothrow) SystemAbilityManagerProxy(nullptr); return systemAbilityManager_; } @@ -70,7 +70,7 @@ sptr SystemAbilityManagerProxy::GetSystemAbility(int32_t systemAb case APP_MGR_SERVICE_ID: if (!g_appMgrService) { GTEST_LOG_(INFO) << "GetSystemAbility(" << systemAbilityId << "): return MockAppMgrService"; - g_appMgrService = new AppExecFwk::MockAppMgrService(); + g_appMgrService = new (std::nothrow) AppExecFwk::MockAppMgrService(); } remote = g_appMgrService; break; diff --git a/services/tokensyncmanager/src/device/device_info_manager.cpp b/services/tokensyncmanager/src/device/device_info_manager.cpp index 70be2a192c36777c36f419292271187173d736c9..cebf8c5a4917a408a6ed2d4d8e51e8484a762258 100644 --- a/services/tokensyncmanager/src/device/device_info_manager.cpp +++ b/services/tokensyncmanager/src/device/device_info_manager.cpp @@ -28,7 +28,7 @@ DeviceInfoManager &DeviceInfoManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - DeviceInfoManager* tmp = new DeviceInfoManager(); + DeviceInfoManager* tmp = new (std::nothrow) DeviceInfoManager(); instance = std::move(tmp); } } diff --git a/services/tokensyncmanager/src/device/device_info_repository.cpp b/services/tokensyncmanager/src/device/device_info_repository.cpp index e90690b0308089d3ca1b8187b6a62a7f3c013219..abfefe4eddb90f80ef73553152913935d7d3f6cf 100644 --- a/services/tokensyncmanager/src/device/device_info_repository.cpp +++ b/services/tokensyncmanager/src/device/device_info_repository.cpp @@ -27,7 +27,7 @@ DeviceInfoRepository &DeviceInfoRepository::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - DeviceInfoRepository* tmp = new DeviceInfoRepository(); + DeviceInfoRepository* tmp = new (std::nothrow) DeviceInfoRepository(); instance = std::move(tmp); } } diff --git a/services/tokensyncmanager/src/remote/remote_command_factory.cpp b/services/tokensyncmanager/src/remote/remote_command_factory.cpp index f485ed8059a50e8e82d4719d084497a59a1f8b1c..be0f6d57ca99ed159bd72c5aedefa2f093e0c008 100644 --- a/services/tokensyncmanager/src/remote/remote_command_factory.cpp +++ b/services/tokensyncmanager/src/remote/remote_command_factory.cpp @@ -30,7 +30,7 @@ RemoteCommandFactory &RemoteCommandFactory::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - RemoteCommandFactory* tmp = new RemoteCommandFactory(); + RemoteCommandFactory* tmp = new (std::nothrow) RemoteCommandFactory(); instance = std::move(tmp); } } diff --git a/services/tokensyncmanager/src/remote/remote_command_manager.cpp b/services/tokensyncmanager/src/remote/remote_command_manager.cpp index e104068c0c3bc3a88e86cfc2545c2352c44fc5bb..2918876a50a3f7d5d29ee7399b4f39e0a594e5a1 100644 --- a/services/tokensyncmanager/src/remote/remote_command_manager.cpp +++ b/services/tokensyncmanager/src/remote/remote_command_manager.cpp @@ -46,7 +46,7 @@ RemoteCommandManager &RemoteCommandManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - RemoteCommandManager* tmp = new RemoteCommandManager(); + RemoteCommandManager* tmp = new (std::nothrow) RemoteCommandManager(); instance = std::move(tmp); } } diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp index 82cf5470aab0610135c2d5b9b427c33dfce03e78..645909a98ceee8dfa32471b10107e2dc67c8b122 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp @@ -75,7 +75,7 @@ SoftBusManager &SoftBusManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - SoftBusManager* tmp = new SoftBusManager(); + SoftBusManager* tmp = new (std::nothrow) SoftBusManager(); instance = std::move(tmp); } } diff --git a/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/getpermissionsstatus_fuzzer.cpp b/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/getpermissionsstatus_fuzzer.cpp index b139ea6fc879a8012c8155a41636e0dbf86c6141..be3d1894bc616e27659601dfce4fc92242845ea8 100644 --- a/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/getpermissionsstatus_fuzzer.cpp +++ b/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/getpermissionsstatus_fuzzer.cpp @@ -30,14 +30,18 @@ using namespace std; using namespace OHOS::Security::AccessToken; namespace OHOS { -const uint8_t *g_baseFuzzData = nullptr; +const uint8_t* g_baseFuzzData = nullptr; size_t g_baseFuzzSize = 0; size_t g_baseFuzzPos = 0; void GetNativeToken() { uint64_t tokenId; - const char **perms = new const char *[1]; + const char** perms = new (std::nothrow) const char *[1]; + if (perms == nullptr) { + return; + } + perms[0] = "ohos.permission.GET_SENSITIVE_PERMISSIONS"; // 3 means the third permission NativeTokenInfoParams infoInstance = { diff --git a/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/getpermissionsstatusstub_fuzzer.cpp b/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/getpermissionsstatusstub_fuzzer.cpp index 3f61fc13f81f24480a2ce682bfeeb965c75043d2..f06378e581c4f342b8342ef6de448f405583355c 100644 --- a/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/getpermissionsstatusstub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/getpermissionsstatusstub_fuzzer.cpp @@ -42,7 +42,11 @@ size_t g_baseFuzzPos = 0; void GetNativeToken() { uint64_t tokenId; - const char **perms = new const char *[1]; + const char** perms = new (std::nothrow) const char *[1]; + if (perms == nullptr) { + return; + } + perms[0] = "ohos.permission.GET_SENSITIVE_PERMISSIONS"; // 3 means the third permission NativeTokenInfoParams infoInstance = { diff --git a/test/fuzztest/services/accesstoken/inituserpolicystub_fuzzer/inituserpolicystub_fuzzer.cpp b/test/fuzztest/services/accesstoken/inituserpolicystub_fuzzer/inituserpolicystub_fuzzer.cpp index f4b01a42cd6cf7178e6b414ab9cf69bfff3753a3..1885cecaca0d3e4869350c2b45c28462d85c2ac6 100644 --- a/test/fuzztest/services/accesstoken/inituserpolicystub_fuzzer/inituserpolicystub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/inituserpolicystub_fuzzer/inituserpolicystub_fuzzer.cpp @@ -40,7 +40,11 @@ namespace OHOS { SetSelfTokenID(g_mockTokenId); return; } - const char **perms = new const char *[1]; + const char** perms = new (std::nothrow) const char *[1]; + if (perms == nullptr) { + return; + } + perms[0] = "ohos.permission.GET_SENSITIVE_PERMISSIONS"; NativeTokenInfoParams infoInstance = { diff --git a/test/fuzztest/services/accesstoken/registerseccompenhancestub_fuzzer/registerseccompenhancestub_fuzzer.cpp b/test/fuzztest/services/accesstoken/registerseccompenhancestub_fuzzer/registerseccompenhancestub_fuzzer.cpp index fcc5821c9c7cf1cc7935275393fb80b6d8341fb6..84cedc88516dc408aa6bbba7701a44012b509509 100644 --- a/test/fuzztest/services/accesstoken/registerseccompenhancestub_fuzzer/registerseccompenhancestub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/registerseccompenhancestub_fuzzer/registerseccompenhancestub_fuzzer.cpp @@ -64,7 +64,7 @@ public: } sptr callback = - sptr(new TokenSyncCallback(std::make_shared())); + sptr(new (std::nothrow) TokenSyncCallback(std::make_shared())); AccessTokenFuzzData fuzzData(data, size); diff --git a/test/fuzztest/services/accesstoken/setpermdialogcap_fuzzer/setpermdialogcap_fuzzer.cpp b/test/fuzztest/services/accesstoken/setpermdialogcap_fuzzer/setpermdialogcap_fuzzer.cpp index 994193a1a4edfcc3e4372b30611b7aced4385bdc..ba4ad29f9d6eef58dc4250989dbc7b16d0cb8ca8 100644 --- a/test/fuzztest/services/accesstoken/setpermdialogcap_fuzzer/setpermdialogcap_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/setpermdialogcap_fuzzer/setpermdialogcap_fuzzer.cpp @@ -35,7 +35,11 @@ namespace OHOS { void GetNativeToken() { uint64_t tokenId; - const char **perms = new const char *[1]; + const char** perms = new (std::nothrow) const char *[1]; + if (perms == nullptr) { + return; + } + perms[0] = "ohos.permission.DISABLE_PERMISSION_DIALOG"; // 3 means the third permission NativeTokenInfoParams infoInstance = { diff --git a/test/fuzztest/services/accesstoken/updateuserpolicystub_fuzzer/updateuserpolicystub_fuzzer.cpp b/test/fuzztest/services/accesstoken/updateuserpolicystub_fuzzer/updateuserpolicystub_fuzzer.cpp index 0714eab49649697a9dfbec66f8633a73e780cc9c..bfc6d562603751cb9e984d3b5d4ef83084482714 100644 --- a/test/fuzztest/services/accesstoken/updateuserpolicystub_fuzzer/updateuserpolicystub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/updateuserpolicystub_fuzzer/updateuserpolicystub_fuzzer.cpp @@ -40,7 +40,11 @@ namespace OHOS { SetSelfTokenID(g_mockTokenId); return; } - const char **perms = new const char *[1]; + const char** perms = new (std::nothrow) const char *[1]; + if (perms == nullptr) { + return; + } + perms[0] = "ohos.permission.GET_SENSITIVE_PERMISSIONS"; NativeTokenInfoParams infoInstance = { diff --git a/test/fuzztest/services/privacy/getpermissionusedrecordsasyncstub_fuzzer/getpermissionusedrecordsasyncstub_fuzzer.cpp b/test/fuzztest/services/privacy/getpermissionusedrecordsasyncstub_fuzzer/getpermissionusedrecordsasyncstub_fuzzer.cpp index 298f6418d3fa03612b8d587fc903847342dca12e..f60eac396f03c1838290e08572948a943e988d81 100644 --- a/test/fuzztest/services/privacy/getpermissionusedrecordsasyncstub_fuzzer/getpermissionusedrecordsasyncstub_fuzzer.cpp +++ b/test/fuzztest/services/privacy/getpermissionusedrecordsasyncstub_fuzzer/getpermissionusedrecordsasyncstub_fuzzer.cpp @@ -70,7 +70,7 @@ namespace OHOS { return false; } - sptr callback(new TestCallBack()); + sptr callback(new (std::nothrow) TestCallBack()); if (!datas.WriteRemoteObject(callback->AsObject())) { return false; } diff --git a/test/fuzztest/services/privacy/sethapwithfgreminderstub_fuzzer/sethapwithfgreminderstub_fuzzer.cpp b/test/fuzztest/services/privacy/sethapwithfgreminderstub_fuzzer/sethapwithfgreminderstub_fuzzer.cpp index 3640773158ca523b976ca1ada12436386d84b20d..c78cdd96fcfb3dbb3d0adadb9f3a026b8fd358da 100644 --- a/test/fuzztest/services/privacy/sethapwithfgreminderstub_fuzzer/sethapwithfgreminderstub_fuzzer.cpp +++ b/test/fuzztest/services/privacy/sethapwithfgreminderstub_fuzzer/sethapwithfgreminderstub_fuzzer.cpp @@ -36,7 +36,11 @@ namespace OHOS { void GetNativeToken() { uint64_t tokenId; - const char **perms = new const char *[1]; + const char** perms = new (std::nothrow) const char *[1]; + if (perms == nullptr) { + return; + } + perms[0] = "ohos.permission.SET_FOREGROUND_HAP_REMINDER"; // 3 means the third permission NativeTokenInfoParams infoInstance = { diff --git a/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/setmutepolicystub_fuzzer.cpp b/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/setmutepolicystub_fuzzer.cpp index 56b6b8760498c7c2f2502209e09e44618a2fb8f9..ebf55518bb0810dc818d26b3b3316160189a7c7e 100644 --- a/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/setmutepolicystub_fuzzer.cpp +++ b/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/setmutepolicystub_fuzzer.cpp @@ -33,13 +33,17 @@ const int CONSTANTS_NUMBER_TWO = 2; static const int32_t ROOT_UID = 0; namespace OHOS { -const uint8_t *g_baseFuzzData = nullptr; +const uint8_t* g_baseFuzzData = nullptr; size_t g_baseFuzzSize = 0; size_t g_baseFuzzPos = 0; void GetNativeToken() { uint64_t tokenId; - const char **perms = new const char *[1]; + const char** perms = new (std::nothrow) const char *[1]; + if (perms == nullptr) { + return; + } + perms[0] = "ohos.permission.GET_SENSITIVE_PERMISSIONS"; // 3 means the third permission NativeTokenInfoParams infoInstance = {