From b2b974dcc65769084d0a7b4063b58f785660fa01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Thu, 19 Jun 2025 18:33:58 +0800 Subject: [PATCH 01/13] =?UTF-8?q?Signed-off-by:=20=E5=86=AF=E4=BF=8A?= =?UTF-8?q?=E6=A1=A6=20=20fuzztest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/fuzztest/sinkservice_fuzzer/BUILD.gn | 61 +++++++++++++++++++ .../fuzztest/sinkservice_fuzzer/corpus/init | 16 +++++ .../fuzztest/sinkservice_fuzzer/project.xml | 25 ++++++++ .../sinkservice_fuzzer/sinkservice_fuzzer.cpp | 47 ++++++++++++++ .../sinkservice_fuzzer/sinkservice_fuzzer.h | 21 +++++++ 5 files changed, 170 insertions(+) create mode 100644 interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/BUILD.gn create mode 100644 interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/corpus/init create mode 100644 interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/project.xml create mode 100644 interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.cpp create mode 100644 interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.h diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/BUILD.gn new file mode 100644 index 00000000..7b8ba064 --- /dev/null +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/BUILD.gn @@ -0,0 +1,61 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("../../../../../../distributedaudio.gni") + +##############################fuzztest########################################## +ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { + module_out_path = "${distributedaudio_fuzz_path}/sinkhandlerinitsink" + fuzz_config_file = + "${innerkits_path}/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer" + + cflags = [ + "-g", + "-O0", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + sources = [ "sinkhandlerinitsink_fuzzer.cpp" ] + + include_dirs = [ + "include", + "${common_path}/include", + "${innerkits_path}/native_cpp/audio_sink/include", + ] + + deps = + [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" ] + + external_deps = [ + "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", + "ipc:ipc_core", + "samgr:samgr_proxy", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"SinkHandlerInitSinkFuzzTest\"", + "LOG_DOMAIN=0xD004130", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + deps = [ ":SinkHandlerInitSinkFuzzTest" ] +} +############################################################################### diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/corpus/init b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/corpus/init new file mode 100644 index 00000000..8eb5a7d6 --- /dev/null +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/corpus/init @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ + +FUZZ \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/project.xml b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/project.xml new file mode 100644 index 00000000..6e8ad2cf --- /dev/null +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.cpp b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.cpp new file mode 100644 index 00000000..b39231b7 --- /dev/null +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.cpp @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ + +#include "sinkservice_fuzzer.h" + +#include +#include + +#include "daudio_sink_handler.h" +#include "if_system_ability_manager.h" +#include "iservice_registry.h" + +namespace OHOS { +namespace DistributedHardware { +void SinkServiceFuzzTest(const uint8_t* data, size_t size) +{ + if (data == nullptr) { + return; + } + DAudioSinkService service; + std::vector args; + args.push_back(u"test"); + service.Dump(1, args); +} +} +} + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::DistributedHardware::SinkHandlerInitSinkFuzzTest(data, size); + return 0; +} + diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.h b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.h new file mode 100644 index 00000000..4b705c26 --- /dev/null +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ + +#ifndef SINKSERVICE_FUZZER_H +#define SINKSERVICE_FUZZER_H + +#define FUZZ_PROJECT_NAME "sinkservice_fuzzer" + +#endif \ No newline at end of file -- Gitee From f8d02678544c452b0053865e231df4c4a48f2e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Tue, 24 Jun 2025 18:05:17 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E9=9F=B3=E9=A2=91fuzz=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../native_cpp/test/fuzztest/BUILD.gn | 1 + .../fuzztest/sinkservicedump_fuzzer}/BUILD.gn | 19 ++++++++----- .../sinkservicedump_fuzzer}/corpus/init | 0 .../sinkservicedump_fuzzer}/project.xml | 0 .../sinkservicedump_fuzzer.cpp | 27 +++++++++++++------ .../sinkservicedump_fuzzer.h | 6 ++--- 6 files changed, 35 insertions(+), 18 deletions(-) rename {interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer => services/audiomanager/test/fuzztest/sinkservicedump_fuzzer}/BUILD.gn (76%) rename {interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer => services/audiomanager/test/fuzztest/sinkservicedump_fuzzer}/corpus/init (100%) rename {interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer => services/audiomanager/test/fuzztest/sinkservicedump_fuzzer}/project.xml (100%) rename interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.cpp => services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp (55%) rename interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.h => services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.h (84%) diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn index f4754e41..93d9f530 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn @@ -35,6 +35,7 @@ group("fuzztest") { "${services_path}/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer:fuzztest", "${services_path}/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer:fuzztest", "${services_path}/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer:fuzztest", + "${services_path}/audiomanager/test/fuzztest/sourceservicedump_fuzzer:fuzztest", "${services_path}/common/test/fuzztest/audiodatasetinit64_fuzzer:fuzztest", "onremotesinksvrdied_fuzzer:fuzztest", "onremotesourcesvrdied_fuzzer:fuzztest", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn similarity index 76% rename from interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/BUILD.gn rename to services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn index 7b8ba064..b3ea0493 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn @@ -17,10 +17,10 @@ import("//build/test.gni") import("../../../../../../distributedaudio.gni") ##############################fuzztest########################################## -ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { - module_out_path = "${distributedaudio_fuzz_path}/sinkhandlerinitsink" +ohos_fuzztest("SinkServiceDumpFuzzTest") { + module_out_path = "${distributedaudio_fuzz_path}/sinkservicedump_fuzzer" fuzz_config_file = - "${innerkits_path}/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer" + "${innerkits_path}/native_cpp/test/fuzztest/sinkservicedump_fuzzer" cflags = [ "-g", @@ -28,16 +28,21 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] - sources = [ "sinkhandlerinitsink_fuzzer.cpp" ] + sources = [ "sinkservicedump_fuzzer.cpp" ] include_dirs = [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", + "${innerkits_path}/audiomanager/servicesink/include", + ] deps = - [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" ] + [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" + "${services_path}/audiomanager/servicesink:distributed_audio_sink", + ] + external_deps = [ "c_utils:utils", @@ -48,7 +53,7 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkHandlerInitSinkFuzzTest\"", + "DH_LOG_TAG=\"SinkServiceDumpFuzzTest\"", "LOG_DOMAIN=0xD004130", ] } @@ -56,6 +61,6 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":SinkHandlerInitSinkFuzzTest" ] + deps = [ ":SinkServiceDumpFuzzTest" ] } ############################################################################### diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/corpus/init b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/corpus/init similarity index 100% rename from interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/corpus/init rename to services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/corpus/init diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/project.xml b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/project.xml similarity index 100% rename from interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/project.xml rename to services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/project.xml diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.cpp b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp similarity index 55% rename from interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.cpp rename to services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp index b39231b7..a4698c4a 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.cpp +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp @@ -13,26 +13,37 @@ * limitations under the License. */ -#include "sinkservice_fuzzer.h" +#include "sinkservicedump_fuzzer.h" #include #include +#include -#include "daudio_sink_handler.h" +#include "daudio_sink_service.h" +#include "daydui_sink_ipc_callback.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" namespace OHOS { namespace DistributedHardware { -void SinkServiceFuzzTest(const uint8_t* data, size_t size) +void SinkServiceDumpFuzzTest(const uint8_t* data, size_t size) { - if (data == nullptr) { + if (data == nullptr|| size == 0) { return; } - DAudioSinkService service; + FuzzdDataProvider fdp(data, size); + int32_t fd = fdp.ConsumeIntegral(); + size_t argsCount = fdp.ConsumeIntegralInRange(0,10); std::vector args; - args.push_back(u"test"); - service.Dump(1, args); + + for (size_t i = 0; i(fd,true); + dAudioSinkService->Dump(fd,args); } } } @@ -41,7 +52,7 @@ void SinkServiceFuzzTest(const uint8_t* data, size_t size) extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { /* Run your code on data */ - OHOS::DistributedHardware::SinkHandlerInitSinkFuzzTest(data, size); + OHOS::DistributedHardware::SinkServiceDumpFuzzTest(data, size); return 0; } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.h b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.h similarity index 84% rename from interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.h rename to services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.h index 4b705c26..c30a3f4f 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkservice_fuzzer/sinkservice_fuzzer.h +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.h @@ -13,9 +13,9 @@ * limitations under the License. */ -#ifndef SINKSERVICE_FUZZER_H -#define SINKSERVICE_FUZZER_H +#ifndef SINKSERVICEDUMP_FUZZER_H +#define SINKSERVICEDUMP_FUZZER_H -#define FUZZ_PROJECT_NAME "sinkservice_fuzzer" +#define FUZZ_PROJECT_NAME "sinkservicedump_fuzzer" #endif \ No newline at end of file -- Gitee From 25083c754f53ece1968a1bbf3cadd4562a40cd5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Tue, 24 Jun 2025 18:55:28 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E9=9F=B3=E9=A2=91fuzz=E8=A1=A5=E5=85=85?= =?UTF-8?q?=20Signed-off-by:=20=E5=86=AF=E4=BF=8A=E6=A1=A6=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inner_kits/native_cpp/test/fuzztest/BUILD.gn | 2 +- .../sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn index 93d9f530..fcc2a5f1 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn @@ -35,7 +35,7 @@ group("fuzztest") { "${services_path}/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer:fuzztest", "${services_path}/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer:fuzztest", "${services_path}/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer:fuzztest", - "${services_path}/audiomanager/test/fuzztest/sourceservicedump_fuzzer:fuzztest", + "${services_path}/audiomanager/test/fuzztest/sinkservicedump_fuzzer:fuzztest", "${services_path}/common/test/fuzztest/audiodatasetinit64_fuzzer:fuzztest", "onremotesinksvrdied_fuzzer:fuzztest", "onremotesourcesvrdied_fuzzer:fuzztest", diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp index a4698c4a..f939f2c1 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp @@ -28,22 +28,22 @@ namespace OHOS { namespace DistributedHardware { void SinkServiceDumpFuzzTest(const uint8_t* data, size_t size) { - if (data == nullptr|| size == 0) { + if (data == nullptr || size == 0) { return; } FuzzdDataProvider fdp(data, size); int32_t fd = fdp.ConsumeIntegral(); - size_t argsCount = fdp.ConsumeIntegralInRange(0,10); + size_t argsCount = fdp.ConsumeIntegralInRange(0, 10); std::vector args; - for (size_t i = 0; i(fd,true); - dAudioSinkService->Dump(fd,args); + auto dAudioSinkService = std::make_shared(fd, true); + dAudioSinkService->Dump(fd, args); } } } -- Gitee From cb66c6a89ff5986043d919edc28616556a5f06b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Tue, 24 Jun 2025 19:18:52 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E9=9F=B3=E9=A2=91fuzz=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp index f939f2c1..cc0f5144 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp @@ -36,7 +36,7 @@ void SinkServiceDumpFuzzTest(const uint8_t* data, size_t size) size_t argsCount = fdp.ConsumeIntegralInRange(0, 10); std::vector args; - for ( size_t i = 0; i< argsCount; ++i) { + for ( size_t i = 0; i < argsCount; ++i) { std::string utf8Str = fdp.ConsumeRandomLengthString(100); std::u16string utf16Str(utf8Str.begin(), utf8Str.end()); args.emplace_back(utf16Str); -- Gitee From e76ccde27939dca6c822cf79395a9049f339ba28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Tue, 24 Jun 2025 19:32:45 +0800 Subject: [PATCH 05/13] =?UTF-8?q?FUZZ=E9=9F=B3=E9=A2=91=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp index cc0f5144..70232a06 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp @@ -36,7 +36,7 @@ void SinkServiceDumpFuzzTest(const uint8_t* data, size_t size) size_t argsCount = fdp.ConsumeIntegralInRange(0, 10); std::vector args; - for ( size_t i = 0; i < argsCount; ++i) { + for (size_t i = 0; i < argsCount; ++i) { std::string utf8Str = fdp.ConsumeRandomLengthString(100); std::u16string utf16Str(utf8Str.begin(), utf8Str.end()); args.emplace_back(utf16Str); -- Gitee From 0330f0a60a6ba879e7dd1d163213a1aee97e06ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Tue, 24 Jun 2025 19:48:31 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E9=9F=B3=E9=A2=91fuzz=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../test/fuzztest/sinkservicedump_fuzzer/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn index b3ea0493..051a8319 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn @@ -39,8 +39,8 @@ ohos_fuzztest("SinkServiceDumpFuzzTest") { ] deps = - [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk" - "${services_path}/audiomanager/servicesink:distributed_audio_sink", + [ "${innerkits_path}/native_cpp/audio_sink:distributed_audio_sink_sdk", + "${services_path}/audiomanager/servicesink:distributed_audio_sink", ] -- Gitee From 53ee02ee277d1b6c4134fe53e930734f9e3e24d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 25 Jun 2025 10:19:41 +0800 Subject: [PATCH 07/13] =?UTF-8?q?fuzz=E9=9F=B3=E9=A2=91=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../test/fuzztest/sinkservicedump_fuzzer/BUILD.gn | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn index 051a8319..e2fee816 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ import("../../../../../../distributedaudio.gni") ohos_fuzztest("SinkServiceDumpFuzzTest") { module_out_path = "${distributedaudio_fuzz_path}/sinkservicedump_fuzzer" fuzz_config_file = - "${innerkits_path}/native_cpp/test/fuzztest/sinkservicedump_fuzzer" + "${innerkits_path}/audiomanager/test/fuzztest/sinkservicedump_fuzzer" cflags = [ "-g", @@ -43,19 +43,21 @@ ohos_fuzztest("SinkServiceDumpFuzzTest") { "${services_path}/audiomanager/servicesink:distributed_audio_sink", ] + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"SinkServiceDumpFuzzTest\"", + "LOG_DOMAIN=0xD004130", + ] external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", + 'safwk:system_ability_fwk", "samgr:samgr_proxy", ] - defines = [ - "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkServiceDumpFuzzTest\"", - "LOG_DOMAIN=0xD004130", - ] + } ############################################################################### -- Gitee From 236a3086b121097d5c89740851c6fb57d42c840b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 25 Jun 2025 10:36:41 +0800 Subject: [PATCH 08/13] =?UTF-8?q?fuzz=E9=9F=B3=E9=A2=91=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn index e2fee816..aaaf001c 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn @@ -34,8 +34,7 @@ ohos_fuzztest("SinkServiceDumpFuzzTest") { "include", "${common_path}/include", "${innerkits_path}/native_cpp/audio_sink/include", - "${innerkits_path}/audiomanager/servicesink/include", - + "${services_path}/audiomanager/servicesink/include", ] deps = -- Gitee From 6b77b4dc442c03b3fd2c1037cdab04f05bebf0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 25 Jun 2025 11:16:19 +0800 Subject: [PATCH 09/13] =?UTF-8?q?fuzz=E9=9F=B3=E9=A2=91=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn index aaaf001c..9ad3e554 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("SinkServiceDumpFuzzTest") { "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", - 'safwk:system_ability_fwk", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] -- Gitee From ceec39caf0c7ecdedcc62dc435247902327080ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 25 Jun 2025 11:59:29 +0800 Subject: [PATCH 10/13] =?UTF-8?q?fuzz=E9=9F=B3=E9=A2=91=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn index 9ad3e554..44f91bfe 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../distributedaudio.gni") +import("../../../../../distributedaudio.gni") ##############################fuzztest########################################## ohos_fuzztest("SinkServiceDumpFuzzTest") { -- Gitee From d7081327a8c09317e41d9aaf677e50fe68cf2b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 25 Jun 2025 15:06:35 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E9=9F=B3=E9=A2=91fuzz=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn index 44f91bfe..7fcf18a3 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ import("../../../../../distributedaudio.gni") ohos_fuzztest("SinkServiceDumpFuzzTest") { module_out_path = "${distributedaudio_fuzz_path}/sinkservicedump_fuzzer" fuzz_config_file = - "${innerkits_path}/audiomanager/test/fuzztest/sinkservicedump_fuzzer" + "${services_path}/audiomanager/test/fuzztest/sinkservicedump_fuzzer" cflags = [ "-g", -- Gitee From df59a229b16d259f40f12d6918a24f4096dbbbda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 25 Jun 2025 15:27:53 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E9=9F=B3=E9=A2=91fuzz=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp index 70232a06..af4ce4bc 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp @@ -20,7 +20,7 @@ #include #include "daudio_sink_service.h" -#include "daydui_sink_ipc_callback.h" +#include "daudio_sink_ipc_callback.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" -- Gitee From 36970fc9a285a4658964a43e9990b502b2327bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 25 Jun 2025 15:43:43 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E9=9F=B3=E9=A2=91fuzz=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp index af4ce4bc..65ef9782 100644 --- a/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp +++ b/services/audiomanager/test/fuzztest/sinkservicedump_fuzzer/sinkservicedump_fuzzer.cpp @@ -31,7 +31,7 @@ void SinkServiceDumpFuzzTest(const uint8_t* data, size_t size) if (data == nullptr || size == 0) { return; } - FuzzdDataProvider fdp(data, size); + FuzzedDataProvider fdp(data, size); int32_t fd = fdp.ConsumeIntegral(); size_t argsCount = fdp.ConsumeIntegralInRange(0, 10); std::vector args; -- Gitee