From 436c23529ab75a6e986bf1f6d4fe72ee1222ec73 Mon Sep 17 00:00:00 2001
From: lvchao <lvchao28@huawei.com>
Date: Thu, 24 Apr 2025 16:15:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:dataObject=20FUZZ=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: lvchao <lvchao28@huawei.com>
---
 .../objectservicestub_fuzzer.cpp              | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/objectservicestub_fuzzer.cpp b/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/objectservicestub_fuzzer.cpp
index 24ce52ba6..d5c754b42 100644
--- a/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/objectservicestub_fuzzer.cpp
+++ b/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/objectservicestub_fuzzer.cpp
@@ -13,14 +13,15 @@
  * limitations under the License.
  */
 
-#include "objectservicestub_fuzzer.h"
+#include <fuzzer/FuzzedDataProvider.h>
 
 #include <cstddef>
 #include <cstdint>
 
 #include "ipc_skeleton.h"
-#include "object_service_impl.h"
 #include "message_parcel.h"
+#include "object_service_impl.h"
+#include "objectservicestub_fuzzer.h"
 #include "securec.h"
 
 using namespace OHOS::DistributedObject;
@@ -32,17 +33,18 @@ constexpr uint32_t CODE_MAX = static_cast<uint32_t>(ObjectCode::OBJECTSTORE_SERV
 constexpr size_t NUM_MIN = 5;
 constexpr size_t NUM_MAX = 12;
 
-bool OnRemoteRequestFuzz(const uint8_t *data, size_t size)
+bool OnRemoteRequestFuzz(FuzzedDataProvider &provider)
 {
     std::shared_ptr<ObjectServiceImpl> objectServiceImpl = std::make_shared<ObjectServiceImpl>();
     std::shared_ptr<ExecutorPool> executor = std::make_shared<ExecutorPool>(NUM_MAX, NUM_MIN);
     objectServiceImpl->OnBind(
         { "ObjectServiceStubFuzz", static_cast<uint32_t>(IPCSkeleton::GetSelfTokenID()), std::move(executor) });
 
-    uint32_t code = static_cast<uint32_t>(*data) % (CODE_MAX - CODE_MIN + 1) + CODE_MIN;
+    uint32_t code = provider.ConsumeIntegralInRange<uint32_t>(CODE_MIN, CODE_MAX);
     MessageParcel request;
     request.WriteInterfaceToken(INTERFACE_TOKEN);
-    request.WriteBuffer(data, size);
+    std::vector<uint8_t> remaining_data = provider.ConsumeRemainingBytes<uint8_t>();
+    request.WriteBuffer(static_cast<void *>(remaining_data.data()), remaining_data.size());
     request.RewindRead(0);
     MessageParcel reply;
     std::shared_ptr<ObjectServiceStub> objectServiceStub = objectServiceImpl;
@@ -54,11 +56,8 @@ bool OnRemoteRequestFuzz(const uint8_t *data, size_t size)
 /* Fuzzer entry point */
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 {
-    if (data == nullptr) {
-        return 0;
-    }
-
-    OHOS::OnRemoteRequestFuzz(data, size);
+    FuzzedDataProvider provider(data, size);
+    OHOS::OnRemoteRequestFuzz(provider);
 
     return 0;
 }
\ No newline at end of file
-- 
Gitee