From 6e17cd0adc4597890c6f794e7c68582e0101031e Mon Sep 17 00:00:00 2001 From: gecheng Date: Thu, 28 Aug 2025 17:12:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?FUZZ=E7=94=A8=E4=BE=8B=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BD=BF=E7=94=A8=E5=8F=98=E5=BC=82=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gecheng --- .../fuzztest/syncstrategies_fuzzer/syncstrategies_fuzzer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/distributeddataservice/service/test/fuzztest/syncstrategies_fuzzer/syncstrategies_fuzzer.cpp b/services/distributeddataservice/service/test/fuzztest/syncstrategies_fuzzer/syncstrategies_fuzzer.cpp index 6a845885e..efa251278 100644 --- a/services/distributeddataservice/service/test/fuzztest/syncstrategies_fuzzer/syncstrategies_fuzzer.cpp +++ b/services/distributeddataservice/service/test/fuzztest/syncstrategies_fuzzer/syncstrategies_fuzzer.cpp @@ -51,8 +51,9 @@ void SyncStrategiesFuzz003(FuzzedDataProvider &provider) strategyInstance.GetKey(user); NetworkSyncStrategy::StrategyInfo info; - info.user = 1; - info.bundleName = "StrategyInfo"; + info.user = provider.ConsumeIntegral(); + info.bundleName = provider.ConsumeRandomLengthString(100); + info.strategy = provider.ConsumeIntegral(); Serializable::json node; std::string key = provider.ConsumeRandomLengthString(100); std::string valueStr = provider.ConsumeRandomLengthString(100); -- Gitee From a5b41be4762de1881040ad2a01515db8177d7d03 Mon Sep 17 00:00:00 2001 From: gecheng Date: Thu, 28 Aug 2025 17:42:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?FUZZ=E7=94=A8=E4=BE=8B=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BD=BF=E7=94=A8=E5=8F=98=E5=BC=82=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gecheng --- .../syncstrategies_fuzzer.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/services/distributeddataservice/service/test/fuzztest/syncstrategies_fuzzer/syncstrategies_fuzzer.cpp b/services/distributeddataservice/service/test/fuzztest/syncstrategies_fuzzer/syncstrategies_fuzzer.cpp index efa251278..a7915f6ac 100644 --- a/services/distributeddataservice/service/test/fuzztest/syncstrategies_fuzzer/syncstrategies_fuzzer.cpp +++ b/services/distributeddataservice/service/test/fuzztest/syncstrategies_fuzzer/syncstrategies_fuzzer.cpp @@ -22,10 +22,12 @@ using namespace OHOS::DistributedData; using namespace OHOS::CloudData; namespace OHOS { +constexpr int NUM_MAX = 100; + void SyncStrategiesFuzz001(FuzzedDataProvider &provider) { int32_t user = provider.ConsumeIntegral(); - std::string bundleName = provider.ConsumeRandomLengthString(100); + std::string bundleName = provider.ConsumeRandomLengthString(NUM_MAX); static NetworkDelegateNormalImpl delegate; NetworkDelegate::RegisterNetworkInstance(&delegate); NetworkSyncStrategy strategy; @@ -45,22 +47,22 @@ void SyncStrategiesFuzz002(FuzzedDataProvider &provider) void SyncStrategiesFuzz003(FuzzedDataProvider &provider) { int32_t user = provider.ConsumeIntegral(); - std::string bundleName = provider.ConsumeRandomLengthString(100); + std::string bundleName = provider.ConsumeRandomLengthString(NUM_MAX); NetworkSyncStrategy strategyInstance; strategyInstance.GetStrategy(user, bundleName); strategyInstance.GetKey(user); NetworkSyncStrategy::StrategyInfo info; info.user = provider.ConsumeIntegral(); - info.bundleName = provider.ConsumeRandomLengthString(100); + info.bundleName = provider.ConsumeRandomLengthString(NUM_MAX); info.strategy = provider.ConsumeIntegral(); Serializable::json node; - std::string key = provider.ConsumeRandomLengthString(100); - std::string valueStr = provider.ConsumeRandomLengthString(100); + std::string key = provider.ConsumeRandomLengthString(NUM_MAX); + std::string valueStr = provider.ConsumeRandomLengthString(NUM_MAX); int valueInt = provider.ConsumeIntegral(); float valueFloat = provider.ConsumeFloatingPoint(); bool valueBool = provider.ConsumeBool(); - int valueRange = provider.ConsumeIntegralInRange(0, 100); + int valueRange = provider.ConsumeIntegralInRange(0, NUM_MAX); node[key] = valueStr; node["integer"] = valueInt; node["float"] = valueFloat; -- Gitee From 84ec07658072880c3f5b6fcdef0d6383025709f7 Mon Sep 17 00:00:00 2001 From: gecheng Date: Thu, 28 Aug 2025 19:31:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?FUZZ=E7=94=A8=E4=BE=8B=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BD=BF=E7=94=A8=E5=8F=98=E5=BC=82=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gecheng --- .../distributeddataservice/service/cloud/cloud_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/service/cloud/cloud_service_impl.cpp b/services/distributeddataservice/service/cloud/cloud_service_impl.cpp index 3179ab113..afb534d92 100644 --- a/services/distributeddataservice/service/cloud/cloud_service_impl.cpp +++ b/services/distributeddataservice/service/cloud/cloud_service_impl.cpp @@ -1602,7 +1602,7 @@ CloudServiceImpl::HapInfo CloudServiceImpl::GetHapInfo(uint32_t tokenId) { if (AccessTokenKit::GetTokenTypeFlag(tokenId) != TOKEN_HAP) { ZLOGE("TokenType is not TOKEN_HAP, tokenId:0x%{public}x", tokenId); - return { 0, 0, ""}; + return { INVALID_USER_ID, -1, "" }; } HapTokenInfo tokenInfo; int errCode = AccessTokenKit::GetHapTokenInfo(tokenId, tokenInfo); -- Gitee