diff --git a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/distributedhardwarefwkkit_fuzzer.cpp b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/distributedhardwarefwkkit_fuzzer.cpp index 9834b50c5f38b7111580eded9c179973b4dd6b6a..7a5d1ac9c6848a3a28e302224133e501f46900b0 100644 --- a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/distributedhardwarefwkkit_fuzzer.cpp +++ b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/distributedhardwarefwkkit_fuzzer.cpp @@ -48,7 +48,7 @@ void TestPublisherListener::OnMessage(const DHTopic topic, const std::string &me void DistributedHardwareFwkKitFuzzTest(const uint8_t *data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp index 40873405d8e627684f7ac4882f5079ad6c5e9fee..455e8caed5084224f96bfdf4a33b12d746bfee94 100644 --- a/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp +++ b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp @@ -351,10 +351,6 @@ int32_t ComponentManager::Enable(const std::string &networkId, const std::string } auto compEnable = std::make_shared(); - if (compEnable == nullptr) { - DHLOGE("compEnable is null"); - return ERR_DH_FWK_POINTER_IS_NULL; - } auto result = compEnable->Enable(networkId, dhId, param, find->second); if (result != DH_FWK_SUCCESS) { for (int32_t retryCount = 0; retryCount < ENABLE_RETRY_MAX_TIMES; retryCount++) { @@ -388,10 +384,6 @@ int32_t ComponentManager::Disable(const std::string &networkId, const std::strin } auto compDisable = std::make_shared(); - if (compDisable == nullptr) { - DHLOGE("compDisable is null"); - return ERR_DH_FWK_POINTER_IS_NULL; - } auto result = compDisable->Disable(networkId, dhId, find->second); if (result != DH_FWK_SUCCESS) { for (int32_t retryCount = 0; retryCount < DISABLE_RETRY_MAX_TIMES; retryCount++) { diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp index 19d5d29273b33fabf3aa728df1687ba6e686097d..33c429ab3826932c4e80c6799fe7b8c4f586a21d 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp @@ -28,10 +28,6 @@ namespace DistributedHardware { int32_t CapabilityUtils::GetCapabilityByValue(const std::string &value, std::shared_ptr &capPtr) { capPtr = std::make_shared(); - if (capPtr == nullptr) { - DHLOGE("capPtr is null"); - return ERR_DH_FWK_RESOURCE_CAPINFO_POINTER_NULL; - } return capPtr->FromJsonString(value); } diff --git a/services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp b/services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp index d6c0d9b00921c54ffe10b46dff4079bbb87891b8..a4dd7dce4374b42dd311908118c4d53d09e78c5c 100644 --- a/services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp +++ b/services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp @@ -120,9 +120,9 @@ void MonitorTaskTimer::Execute(const std::shared_ptr capInfoPtr = nullptr; TaskParam taskParam; + std::string capabilityKey; for (auto item : enabledDevices) { capabilityKey = item.first; taskParam = item.second; diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp index 9cb74959713d8e88ef5eff28ee92f59113249175..903669c6d00af1d9e6e92905aef07f96593b61d0 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp @@ -41,10 +41,7 @@ void AccessManagerFuzzTest(const uint8_t* data, size_t size) AccessManager::GetInstance()->Init(); DmDeviceInfo deviceInfo; - int32_t ret = memcpy_s(deviceInfo.deviceId, DM_MAX_DEVICE_ID_LEN, (reinterpret_cast(data)), size); - if (ret != EOK) { - return; - } + memcpy_s(deviceInfo.deviceId, DM_MAX_DEVICE_ID_LEN, (reinterpret_cast(data)), size); AccessManager::GetInstance()->OnDeviceReady(deviceInfo); usleep(SLEEP_TIME_US); diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/componentloader_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/componentloader_fuzzer.cpp index 8615305233c2537f5da01272dfaec9a8905732b3..f1d7b904ef2ef59bbfbf58105097cc121ed3b92b 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/componentloader_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/componentloader_fuzzer.cpp @@ -35,7 +35,7 @@ const DHType dhTypeFuzz[DH_TYPE_SIZE] = { void ComponentManagerFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp index 1ead2ed89d1af330c90f1c522abf66857dc07cdb..fae73bcf4146949a0d20c4990caf10a1f19bd16c 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp @@ -36,7 +36,7 @@ namespace { } void ComponentManagerFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/dhmanagerfactory_fuzzer/dhmanagerfactory_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/dhmanagerfactory_fuzzer/dhmanagerfactory_fuzzer.cpp index 4c00873f27fc4b20583827c00e56d98afb311a98..1b6cedafd49d3bffb56fc44a00174c57c7faa024 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/dhmanagerfactory_fuzzer/dhmanagerfactory_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/dhmanagerfactory_fuzzer/dhmanagerfactory_fuzzer.cpp @@ -35,7 +35,7 @@ namespace { void DhManagerFactoryFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/enabledcompsdump_fuzzer/enabledcompsdump_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/enabledcompsdump_fuzzer/enabledcompsdump_fuzzer.cpp index 9d95ed1ec0131c0dbdd23db80aa9b7fb0e650405..da8996db235a6543604576d4a5c5390d42335fbf 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/enabledcompsdump_fuzzer/enabledcompsdump_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/enabledcompsdump_fuzzer/enabledcompsdump_fuzzer.cpp @@ -37,7 +37,7 @@ namespace { void EnableedCompsDumpFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/publisher_fuzzer/publisher_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/publisher_fuzzer/publisher_fuzzer.cpp index 2d1c6e7c5a7bb141995628b7a427f16c7dc39c65..bf29fd5a949c26a4cd2c2509126e2c8e54a3c3aa 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/publisher_fuzzer/publisher_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/publisher_fuzzer/publisher_fuzzer.cpp @@ -53,7 +53,7 @@ int32_t MockPublisherListener::OnRemoteRequest( void PublisherListenerFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/publisheritem_fuzzer/publisheritem_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/publisheritem_fuzzer/publisheritem_fuzzer.cpp index 4320275455397e5a138b2737d438db6667a91554..0929a48f9dec66097cc89148d9e3d49ec54b6e21 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/publisheritem_fuzzer/publisheritem_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/publisheritem_fuzzer/publisheritem_fuzzer.cpp @@ -53,7 +53,7 @@ int32_t MockPublisherItemListener::OnRemoteRequest( void PublisherItemFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/task_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/task_fuzzer.cpp index 22f17590b8ed3b756dfc34f4fa8eefee2989eb8c..1d2e1216c999658bf2f8da6f57bb2f4b1299ca1b 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/task_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/task_fuzzer.cpp @@ -42,7 +42,7 @@ namespace { void TaskFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/versioninfomanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/versioninfomanager_fuzzer.cpp index 264e442167b48992eacee4fbdea2ffa94659e39f..a42e3c7cdec8bae8a52c496fa4b1eaa293c35222 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/versioninfomanager_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/versioninfomanager_fuzzer.cpp @@ -39,7 +39,7 @@ namespace { void VersioninfoManagerFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/utils/test/fuzztest/utils_fuzzer/utils_fuzzer.cpp b/utils/test/fuzztest/utils_fuzzer/utils_fuzzer.cpp index 69b35cedf1656c8507f395f47a3ef883ff0acf5f..f836dda9b68786c424c2125a335790d86be4bae6 100644 --- a/utils/test/fuzztest/utils_fuzzer/utils_fuzzer.cpp +++ b/utils/test/fuzztest/utils_fuzzer/utils_fuzzer.cpp @@ -26,7 +26,7 @@ namespace OHOS { namespace DistributedHardware { void GetAnonyStringTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } @@ -46,7 +46,7 @@ void GetAnonyInt32Test(const uint8_t* data, size_t size) void UtilsToolTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; }