From 42787f1e03955f5ab24e380449c50577adadff75 Mon Sep 17 00:00:00 2001 From: zph Date: Wed, 9 Jul 2025 17:49:44 +0800 Subject: [PATCH 1/2] update Signed-off-by: zph --- .../service/udmf/udmf_service_impl.cpp | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/services/distributeddataservice/service/udmf/udmf_service_impl.cpp b/services/distributeddataservice/service/udmf/udmf_service_impl.cpp index 3cc61d68c..5a9164674 100644 --- a/services/distributeddataservice/service/udmf/udmf_service_impl.cpp +++ b/services/distributeddataservice/service/udmf/udmf_service_impl.cpp @@ -1156,10 +1156,9 @@ int32_t UdmfServiceImpl::SetDelayInfo(const DataLoadInfo &dataLoadInfo, sptr(IPCSkeleton::GetCallingTokenID()), - }; + CustomOption option; + option.intention = UD_INTENTION_DRAG; + option.tokenId = static_cast(IPCSkeleton::GetCallingTokenID()); if (PreProcessUtils::FillRuntimeInfo(unifiedData, option) != E_OK) { ZLOGE("Imputation failed"); return E_ERROR; @@ -1174,10 +1173,9 @@ int32_t UdmfServiceImpl::PushDelayData(const std::string &key, UnifiedData &unif ZLOGE("DelayData callback no exist, key:%{public}s", key.c_str()); return E_ERROR; } - QueryOption query { - .tokenId = it.second.tokenId, - .key = key - }; + QueryOption query; + query.tokenId = it.second.tokenId; + query.key = key; if (option.tokenId != query.tokenId && !IsPermissionInCache(query)) { ZLOGE("No permission"); return E_NO_PERMISSION; @@ -1205,10 +1203,9 @@ int32_t UdmfServiceImpl::GetDataIfAvailable(const std::string &key, const DataLo sptr iUdmfNotifier, std::shared_ptr unifiedData) { ZLOGD("start"); - QueryOption query { - .tokenId = static_cast(IPCSkeleton::GetCallingTokenID()), - .key = key - }; + QueryOption query; + query.tokenId = static_cast(IPCSkeleton::GetCallingTokenID()); + query.key = key; if (unifiedData == nullptr) { ZLOGE("Data is null, key:%{public}s", key.c_str()); return E_ERROR; @@ -1221,10 +1218,9 @@ int32_t UdmfServiceImpl::GetDataIfAvailable(const std::string &key, const DataLo ZLOGE("Retrieve data failed, key:%{public}s", key.c_str()); return status; } - DelayGetDataInfo delayGetDataInfo = { - .dataCallback = iUdmfNotifier, - .tokenId = static_cast(IPCSkeleton::GetCallingTokenID()), - }; + DelayGetDataInfo delayGetDataInfo; + delayGetDataInfo.dataCallback = iUdmfNotifier; + delayGetDataInfo.tokenId = static_cast(IPCSkeleton::GetCallingTokenID()); delayDataCallback_.InsertOrAssign(key, std::move(delayGetDataInfo)); auto it = dataLoadCallback_.Find(key); -- Gitee From 46a4929afb183f845f1a0b8dd09db522d65a3446 Mon Sep 17 00:00:00 2001 From: zph Date: Tue, 15 Jul 2025 15:48:27 +0800 Subject: [PATCH 2/2] update Signed-off-by: zph --- .../udmfservice_fuzzer/udmfservice_fuzzer.cpp | 32 ++++++++----------- .../test/udmf_db_corruption_mock_test.cpp | 7 ++-- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/udmfservice_fuzzer.cpp b/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/udmfservice_fuzzer.cpp index 5c5ba4024..5c9200b09 100644 --- a/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/udmfservice_fuzzer.cpp +++ b/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/udmfservice_fuzzer.cpp @@ -202,11 +202,10 @@ void AddPrivilegeDataFuzz(FuzzedDataProvider &provider) { "UdmfServiceStubFuzz", static_cast(IPCSkeleton::GetSelfTokenID()), std::move(executor) }); QueryOption query = GenerateFuzzQueryOption(provider); - Privilege privilege = { - .tokenId = 1, - .readPermission = "read", - .writePermission = "write" - }; + Privilege privilege; + privilege.tokenId = 1; + privilege.readPermission = "read"; + privilege.writePermission = "write"; MessageParcel request; request.WriteInterfaceToken(INTERFACE_TOKEN); @@ -267,9 +266,8 @@ void ObtainAsynProcessFuzz(FuzzedDataProvider &provider) groupId[i] = provider.ConsumeIntegralInRange(MINIMUM, MINIMUM); } std::string businessUdKey(groupId.begin(), groupId.end()); - AsyncProcessInfo processInfo = { - .businessUdKey = businessUdKey, - }; + AsyncProcessInfo processInfo; + processInfo.businessUdKey = businessUdKey; MessageParcel requestUpdate; requestUpdate.WriteInterfaceToken(INTERFACE_TOKEN); ITypesUtil::Marshal(requestUpdate, processInfo); @@ -427,16 +425,14 @@ void IsPermissionInCacheFuzz(FuzzedDataProvider &provider) void IsReadAndKeepFuzz(FuzzedDataProvider &provider) { std::shared_ptr udmfServiceImpl = std::make_shared(); - Privilege privilege = { - .tokenId = provider.ConsumeIntegral(), - .readPermission = "read", - .writePermission = "write" - }; - Privilege privilege2 = { - .tokenId = provider.ConsumeIntegral(), - .readPermission = "readAndKeep", - .writePermission = "write" - }; + Privilege privilege; + privilege.tokenId = provider.ConsumeIntegral(); + privilege.readPermission = "read"; + privilege.writePermission = "write"; + Privilege privilege2; + privilege2.tokenId = provider.ConsumeIntegral(); + privilege2.readPermission = "readAndKeep"; + privilege2.writePermission = "write"; std::vector privileges = { privilege, privilege2 }; QueryOption query = GenerateFuzzQueryOption(provider); udmfServiceImpl->IsReadAndKeep(privileges, query); diff --git a/services/distributeddataservice/service/test/udmf_db_corruption_mock_test.cpp b/services/distributeddataservice/service/test/udmf_db_corruption_mock_test.cpp index 7d5c7cc94..2ad072531 100644 --- a/services/distributeddataservice/service/test/udmf_db_corruption_mock_test.cpp +++ b/services/distributeddataservice/service/test/udmf_db_corruption_mock_test.cpp @@ -103,10 +103,9 @@ HWTEST_F(UdmfServiceImplDbCorruptionMockTest, SaveDataTest001, TestSize.Level1) DistributedData::AccountDelegate::GetInstance()->QueryForegroundUserId(foregroundUserId); key.append(std::to_string(foregroundUserId)); StoreCache::GetInstance().stores_.InsertOrAssign(key, store); - CustomOption option { - .intention = Intention::UD_INTENTION_DATA_HUB, - .tokenId = 1 - }; + CustomOption option; + option.intention = Intention::UD_INTENTION_DATA_HUB; + option.tokenId = 1; auto record = std::make_shared(); UnifiedData data; data.AddRecord(record); -- Gitee