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 ba39bd28739112a2d0e153bf1250181a34080308..8dffe7458959e9d7dda8d22f4ddd593ae7db2023 100644 --- a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/distributedhardwarefwkkit_fuzzer.cpp +++ b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/distributedhardwarefwkkit_fuzzer.cpp @@ -360,7 +360,7 @@ void OnDHFWKOnLineFuzzTest(const uint8_t *data, size_t size) void QueryLocalSysSpecFuzzTest(const uint8_t *data, size_t size) { - if ((data == nullptr) || (size == 0)) { + if ((data == nullptr) || (size < sizeof(uint32_t))) { return; } @@ -372,10 +372,8 @@ void QueryLocalSysSpecFuzzTest(const uint8_t *data, size_t size) void RegisterDHStatusListenerOneParamFuzzTest(const uint8_t *data, size_t size) { - if ((data == nullptr) || (size == 0)) { - return; - } - + (void)data; + (void)size; DistributedHardwareFwkKit dhfwkKit; sptr listener(new TestHDSinkStatusListener()); dhfwkKit.RegisterDHStatusListener(listener); @@ -383,10 +381,8 @@ void RegisterDHStatusListenerOneParamFuzzTest(const uint8_t *data, size_t size) void UnregisterDHStatusListenerOneParamFuzzTest(const uint8_t *data, size_t size) { - if ((data == nullptr) || (size == 0)) { - return; - } - + (void)data; + (void)size; DistributedHardwareFwkKit dhfwkKit; sptr listener(new TestHDSinkStatusListener()); dhfwkKit.UnregisterDHStatusListener(listener); @@ -394,7 +390,7 @@ void UnregisterDHStatusListenerOneParamFuzzTest(const uint8_t *data, size_t size void IsQueryLocalSysSpecTypeValidFuzzTest(const uint8_t *data, size_t size) { - if ((data == nullptr) || (size == 0)) { + if ((data == nullptr) || (size < sizeof(uint32_t))) { return; } @@ -405,7 +401,7 @@ void IsQueryLocalSysSpecTypeValidFuzzTest(const uint8_t *data, size_t size) void RegisterCtlCenterCallbackFuzzTest(const uint8_t *data, size_t size) { - if ((data == nullptr) || (size == 0)) { + if ((data == nullptr) || (size < sizeof(int32_t))) { return; } diff --git a/interfaces/inner_kits/test/fuzztest/getdhdescriptorscallbackstub_fuzzer/getdhdescriptorscallbackstub_fuzzer.cpp b/interfaces/inner_kits/test/fuzztest/getdhdescriptorscallbackstub_fuzzer/getdhdescriptorscallbackstub_fuzzer.cpp index 642eef5ea3cf413902da0fb96ec34365b32bfee9..b1d849f03b7b2822a12bcf75d6f86b62f0134ebb 100644 --- a/interfaces/inner_kits/test/fuzztest/getdhdescriptorscallbackstub_fuzzer/getdhdescriptorscallbackstub_fuzzer.cpp +++ b/interfaces/inner_kits/test/fuzztest/getdhdescriptorscallbackstub_fuzzer/getdhdescriptorscallbackstub_fuzzer.cpp @@ -48,7 +48,7 @@ void FuzzGetDhDescriptorsCallbackStub::OnError(const std::string &networkId, int void OnRemoteRequestFuzzTest(const uint8_t *data, size_t size) { - if ((data == nullptr) || (size < sizeof(uint32_t))) { + if ((data == nullptr) || (size < sizeof(uint32_t) + sizeof(uint32_t) + 1)) { return; } MessageParcel parcel; diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp index 339cc1632d6b96e185549f4e15348cd3be2e2758..0b2fb6e1473d19dd59f5887d486e6d0af2d0808b 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp @@ -86,61 +86,51 @@ void OnDeviceChangedFuzzTest(const uint8_t* data, size_t size) void UnInitFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size > DM_MAX_DEVICE_ID_LEN)) { - return; - } - + (void)data; + (void)size; AccessManager::GetInstance()->UnInit(); usleep(SLEEP_TIME_US); } void UnInitDeviceManagerFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size > DM_MAX_DEVICE_ID_LEN)) { - return; - } - + (void)data; + (void)size; AccessManager::GetInstance()->UnInitDeviceManager(); usleep(SLEEP_TIME_US); } void UnRegisterDevStateCallbackFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size > DM_MAX_DEVICE_ID_LEN)) { - return; - } - + (void)data; + (void)size; AccessManager::GetInstance()->UnRegisterDevStateCallback(); usleep(SLEEP_TIME_US); } void OnRemoteDiedFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size > DM_MAX_DEVICE_ID_LEN)) { - return; - } - + (void)data; + (void)size; AccessManager::GetInstance()->OnRemoteDied(); usleep(SLEEP_TIME_US); } void CheckTrustedDeviceOnlineFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size > DM_MAX_DEVICE_ID_LEN)) { - return; - } - + (void)data; + (void)size; AccessManager::GetInstance()->CheckTrustedDeviceOnline(); usleep(SLEEP_TIME_US); } void DumpFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size > DM_MAX_DEVICE_ID_LEN)) { + if ((data == nullptr) || (size == 0)) { return; } - std::vector argsStr = {reinterpret_cast(data)}; + std::vector argsStr; std::string result = {reinterpret_cast(data)}; AccessManager::GetInstance()->Dump(argsStr, result); usleep(SLEEP_TIME_US); diff --git a/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/capabilityinfomanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/capabilityinfomanager_fuzzer.cpp index 4469aea1901a39300b671fa7beffa5275313c7e4..eaf84fe0ba29cf0ec24e49b116e816e26412aa58 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/capabilityinfomanager_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/capabilityinfomanager_fuzzer.cpp @@ -333,10 +333,8 @@ void CapabilityInfoManagerEventHandlerCtorFuzzTest(const uint8_t* data, size_t s void GetEventHandlerFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size == 0)) { - return; - } - + (void)data; + (void)size; CapabilityInfoManager::GetInstance()->GetEventHandler(); } @@ -365,11 +363,9 @@ void OnChangeFuzzTest(const uint8_t* data, size_t size) void GetDataByDHTypeFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size == 0)) { - return; - } - - DHType dhType = static_cast(data[0]); + (void)data; + (void)size; + DHType dhType = DHType::AUDIO; std::map> capabilityMap; CapabilityInfoManager::GetInstance()->GetDataByDHType(dhType, capabilityMap); } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/dhcommtool_fuzzer/dhcommtool_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/dhcommtool_fuzzer/dhcommtool_fuzzer.cpp index ee4a511238edadee1397e51245e7b4b75dbdd794..30223b7ac83c94210a4dcc11fc5b26afc1a9cdca 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/dhcommtool_fuzzer/dhcommtool_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/dhcommtool_fuzzer/dhcommtool_fuzzer.cpp @@ -71,27 +71,24 @@ void DhTransportParseAndSaveRemoteDHCapsFuzzTest(const uint8_t* data, size_t siz void DhTransportInitFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size == 0)) { - return; - } + (void)data; + (void)size; std::shared_ptr dhCommTool = std::make_shared(); dhCommTool->Init(); } void DhTransportUnInitFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size == 0)) { - return; - } + (void)data; + (void)size; std::shared_ptr dhCommTool = std::make_shared(); dhCommTool->UnInit(); } void DHCommToolEventHandlerCtorFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size == 0)) { - return; - } + (void)data; + (void)size; auto runner = AppExecFwk::EventRunner::Create(true); std::shared_ptr commToolPtr; DHCommTool::DHCommToolEventHandler handler(runner, commToolPtr); @@ -116,9 +113,8 @@ void DHCommToolEventHandlerProcessEventFuzzTest(const uint8_t* data, size_t size void DHCommToolEventHandlerProcessFullCapsRspFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size == 0)) { - return; - } + (void)data; + (void)size; auto runner = AppExecFwk::EventRunner::Create(true); auto commTool = std::make_shared(); DHCommTool::DHCommToolEventHandler handler(runner, commTool); diff --git a/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp index 8c1329d6950f8e3c89059e09b3d558b25ede4405..48714bb884c8327740607374982511b0a3141c61 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp @@ -203,9 +203,8 @@ void DhTransportOnShutdownFuzzTest(const uint8_t* data, size_t size) void DhTransportInitFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size < sizeof(int32_t))) { - return; - } + (void)data; + (void)size; std::shared_ptr dhCommTool = std::make_shared(); std::shared_ptr dhTransportTest = std::make_shared(dhCommTool); dhTransportTest->Init(); @@ -223,9 +222,8 @@ void DhTransportOnBytesFuzzTest(const uint8_t* data, size_t size) void DhTransportGetDHCommToolPtrFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size < sizeof(int32_t))) { - return; - } + (void)data; + (void)size; auto ptr = GetDHCommToolPtr(); } }