From d88685fb52390e1bea264e010d81f6d185db6d60 Mon Sep 17 00:00:00 2001
From: Jeam_wang <jeam.wangwei@h-partners.com>
Date: Sat, 2 Aug 2025 18:49:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?cloudservicestubfuzz=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jeam_wang <jeam.wangwei@h-partners.com>
---
 .../cloudservicestub_fuzzer.cpp                    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/cloudservicestub_fuzzer.cpp b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/cloudservicestub_fuzzer.cpp
index 9e467e6bc..37e7b18c3 100644
--- a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/cloudservicestub_fuzzer.cpp
+++ b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/cloudservicestub_fuzzer.cpp
@@ -69,13 +69,15 @@ void AllocAndSetHapToken()
 
 bool OnRemoteRequestFuzz(FuzzedDataProvider &provider)
 {
-    std::shared_ptr<CloudServiceImpl> cloudServiceImpl = std::make_shared<CloudServiceImpl>();
-    std::shared_ptr<ExecutorPool> executor = std::make_shared<ExecutorPool>(NUM_MAX, NUM_MIN);
-    cloudServiceImpl->OnBind(
-        { "CloudServiceStubFuzz", static_cast<uint32_t>(IPCSkeleton::GetSelfTokenID()), std::move(executor) });
-
+    static std::shared_ptr<CloudServiceImpl> cloudServiceImpl = std::make_shared<CloudServiceImpl>();
+    static std::once_flag onceFlag;
+    std::call_once(onceFlag, [&]() {
+        std::shared_ptr<ExecutorPool> executor = std::make_shared<ExecutorPool>(NUM_MAX, NUM_MIN);
+        cloudServiceImpl->OnBind(
+            { "CloudServiceStubFuzz", static_cast<uint32_t>(IPCSkeleton::GetSelfTokenID()), std::move(executor) });
+    });
+    
     AllocAndSetHapToken();
-
     uint32_t code = provider.ConsumeIntegralInRange<uint32_t>(CODE_MIN, CODE_MAX);
     std::vector<uint8_t> remainingData = provider.ConsumeRemainingBytes<uint8_t>();
     MessageParcel request;
-- 
Gitee


From b162ec8f469597aeeb5a65229a2402cd1dd5ae8a Mon Sep 17 00:00:00 2001
From: Jeam_wang <jeam.wangwei@h-partners.com>
Date: Mon, 4 Aug 2025 09:40:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?cloudservicestubfuzz=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jeam_wang <jeam.wangwei@h-partners.com>
---
 .../cloudservicestub_fuzzer/cloudservicestub_fuzzer.cpp       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/cloudservicestub_fuzzer.cpp b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/cloudservicestub_fuzzer.cpp
index 37e7b18c3..729042205 100644
--- a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/cloudservicestub_fuzzer.cpp
+++ b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/cloudservicestub_fuzzer.cpp
@@ -75,9 +75,9 @@ bool OnRemoteRequestFuzz(FuzzedDataProvider &provider)
         std::shared_ptr<ExecutorPool> executor = std::make_shared<ExecutorPool>(NUM_MAX, NUM_MIN);
         cloudServiceImpl->OnBind(
             { "CloudServiceStubFuzz", static_cast<uint32_t>(IPCSkeleton::GetSelfTokenID()), std::move(executor) });
+        AllocAndSetHapToken();
     });
-    
-    AllocAndSetHapToken();
+
     uint32_t code = provider.ConsumeIntegralInRange<uint32_t>(CODE_MIN, CODE_MAX);
     std::vector<uint8_t> remainingData = provider.ConsumeRemainingBytes<uint8_t>();
     MessageParcel request;
-- 
Gitee