diff --git a/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h b/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h index 7561c06a6bfc6634e6c0ad54f704dc5290b40b59..a8855ef646b28611f40b464ce98f0d2f1703cb7e 100644 --- a/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h +++ b/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h @@ -114,7 +114,7 @@ int DBinderBaseInvoker::SendRequest(int32_t handle, uint32_t code, MessagePar } else { ret = SendOrWaitForCompletion(userWaitTime, seqNumber, session, &reply); } - HitraceInvoker::TraceClientReceieve(handle, code, flags, traceId, childId); + HitraceInvoker::TraceClientReceive(handle, code, flags, traceId, childId); // restore Parcel data newData.RewindWrite(oldWritePosition); return ret; diff --git a/ipc/native/src/core/dbinder/include/dbinder_base_invoker_process.h b/ipc/native/src/core/dbinder/include/dbinder_base_invoker_process.h index eb35ee958eb545187887fbf7aae8553159c34846..6ef6214d81b71a384a0015f69fb59613a461ccdd 100644 --- a/ipc/native/src/core/dbinder/include/dbinder_base_invoker_process.h +++ b/ipc/native/src/core/dbinder/include/dbinder_base_invoker_process.h @@ -126,7 +126,7 @@ template void DBinderBaseInvoker::ProcessTransaction(dbinder_transa } uint32_t &newflags = const_cast(tr->flags); - int isServerTraced = HitraceInvoker::TraceServerReceieve(tr->cookie, tr->code, data, newflags); + int isServerTraced = HitraceInvoker::TraceServerReceive(tr->cookie, tr->code, data, newflags); SetStatus(IRemoteInvoker::ACTIVE_INVOKER); int error = TargetStubSendRequest(tr, listenFd, senderSeqNumber, data, reply); HitraceInvoker::TraceServerSend(tr->cookie, tr->code, isServerTraced, newflags); diff --git a/ipc/native/src/core/framework/source/message_parcel.cpp b/ipc/native/src/core/framework/source/message_parcel.cpp index 6d46f7d0d3f2820845641ae2ea4e8f4e565316d7..533e43a929f57c80f47bf37825d2935f08256ec9 100644 --- a/ipc/native/src/core/framework/source/message_parcel.cpp +++ b/ipc/native/src/core/framework/source/message_parcel.cpp @@ -593,6 +593,10 @@ bool MessageParcel::Append(MessageParcel &data) } binder_size_t objectOffsets = data.GetObjectOffsets(); auto *newObjectOffsets = reinterpret_cast(objectOffsets); + if (newObjectOffsets == nullptr) { + ZLOGE(LOG_LABEL, "newObjectOffsets is nullptr"); + return false; + } for (size_t index = 0; index < objectSize; index++) { if (EnsureObjectsCapacity()) { size_t offset = writeCursorOld + newObjectOffsets[index]; diff --git a/ipc/native/src/core/invoker/include/hitrace_invoker.h b/ipc/native/src/core/invoker/include/hitrace_invoker.h index 1035ca9bca3bcf94d22268e80f0afb48042db1a6..4b53180097192c2e39684d73a66c24ccd29d3a34 100644 --- a/ipc/native/src/core/invoker/include/hitrace_invoker.h +++ b/ipc/native/src/core/invoker/include/hitrace_invoker.h @@ -26,12 +26,12 @@ public: static HiviewDFX::HiTraceId TraceClientSend(int32_t handle, uint32_t code, MessageParcel &data, uint32_t &flags, const HiviewDFX::HiTraceId &traceId); - static void TraceClientReceieve(int32_t handle, uint32_t code, uint32_t flags, const HiviewDFX::HiTraceId &traceId, + static void TraceClientReceive(int32_t handle, uint32_t code, uint32_t flags, const HiviewDFX::HiTraceId &traceId, const HiviewDFX::HiTraceId &childId); static void RecoveryDataAndFlag(Parcel &data, uint32_t &flags, size_t oldReadPosition, uint8_t idLen); - static bool TraceServerReceieve(uint64_t handle, uint32_t code, MessageParcel &data, uint32_t &flags); + static bool TraceServerReceive(uint64_t handle, uint32_t code, MessageParcel &data, uint32_t &flags); static void TraceServerSend(uint64_t handle, uint32_t code, bool isServerTraced, uint32_t flags); diff --git a/ipc/native/src/core/invoker/source/binder_invoker.cpp b/ipc/native/src/core/invoker/source/binder_invoker.cpp index c4a0a214ecfc4e205d303ddbc47f032b20d90bdb..8e5b8272fa18a24a08d200c1c3c8a56eded2f9a9 100644 --- a/ipc/native/src/core/invoker/source/binder_invoker.cpp +++ b/ipc/native/src/core/invoker/source/binder_invoker.cpp @@ -179,7 +179,7 @@ int BinderInvoker::SendRequest(int handle, uint32_t code, MessageParcel &data, M if (!WriteTransaction(cmd, flags, handle, code, data, nullptr, totalDBinderBufSize)) { ZLOGE(LABEL, "WriteTransaction ERROR"); newData.RewindWrite(oldWritePosition); - HitraceInvoker::TraceClientReceieve(handle, code, flags, traceId, childId); + HitraceInvoker::TraceClientReceive(handle, code, flags, traceId, childId); return IPC_INVOKER_WRITE_TRANS_ERR; } @@ -195,7 +195,7 @@ int BinderInvoker::SendRequest(int handle, uint32_t code, MessageParcel &data, M ffrt_this_task_set_legacy_mode(false); #endif } - HitraceInvoker::TraceClientReceieve(handle, code, flags, traceId, childId); + HitraceInvoker::TraceClientReceive(handle, code, flags, traceId, childId); // restore Parcel data newData.RewindWrite(oldWritePosition); --sendRequestCount_; @@ -805,7 +805,7 @@ void BinderInvoker::Transaction(binder_transaction_data_secctx& trSecctx) } uint32_t &newFlags = const_cast(tr.flags); - int isServerTraced = HitraceInvoker::TraceServerReceieve(static_cast(tr.target.handle), + int isServerTraced = HitraceInvoker::TraceServerReceive(static_cast(tr.target.handle), tr.code, *data, newFlags); InvokerProcInfo oldInvokerProcInfo = { diff --git a/ipc/native/src/core/invoker/source/hitrace_invoker.cpp b/ipc/native/src/core/invoker/source/hitrace_invoker.cpp index 44f18c4d4261ea8c5ac42000e9ef10db84e8ed62..ac496a1d4c7f565f8e8b1e9975a724be81413b90 100644 --- a/ipc/native/src/core/invoker/source/hitrace_invoker.cpp +++ b/ipc/native/src/core/invoker/source/hitrace_invoker.cpp @@ -84,7 +84,7 @@ HiTraceId HitraceInvoker::TraceClientSend(int32_t handle, uint32_t code, Message return childId; } -void HitraceInvoker::TraceClientReceieve(int32_t handle, uint32_t code, uint32_t flags, const HiTraceId &traceId, +void HitraceInvoker::TraceClientReceive(int32_t handle, uint32_t code, uint32_t flags, const HiTraceId &traceId, const HiTraceId &childId) { if (!(flags & TF_HITRACE)) { @@ -112,7 +112,7 @@ void HitraceInvoker::RecoveryDataAndFlag(Parcel &data, uint32_t &flags, size_t o flags &= ~(uint32_t)TF_HITRACE; } -bool HitraceInvoker::TraceServerReceieve(uint64_t handle, uint32_t code, MessageParcel &data, uint32_t &flags) +bool HitraceInvoker::TraceServerReceive(uint64_t handle, uint32_t code, MessageParcel &data, uint32_t &flags) { bool isServerTraced = (flags & TF_HITRACE) != 0; if (!isServerTraced) { diff --git a/ipc/native/test/unittest/common/hitrace_invoker_unittest.cpp b/ipc/native/test/unittest/common/hitrace_invoker_unittest.cpp index a834b2d597cdfedd6e60c4f8f56f91463d3f3b8b..c36e148c8243c5d95fe77e9b251e766cc593e0af 100644 --- a/ipc/native/test/unittest/common/hitrace_invoker_unittest.cpp +++ b/ipc/native/test/unittest/common/hitrace_invoker_unittest.cpp @@ -239,11 +239,11 @@ HWTEST_F(HitraceInvokerTest, RecoveryDataAndFlagTest001, TestSize.Level1) // li } /** - * @tc.name: TraceServerReceieveTest001 - * @tc.desc: TraceServerReceieve + * @tc.name: TraceServerReceiveTest001 + * @tc.desc: TraceServerReceive * @tc.type: FUNC */ -HWTEST_F(HitraceInvokerTest, TraceServerReceieveTest001, TestSize.Level1) // line: 150 +HWTEST_F(HitraceInvokerTest, TraceServerReceiveTest001, TestSize.Level1) // line: 150 { NiceMock mock; int handle = 1; @@ -256,16 +256,16 @@ HWTEST_F(HitraceInvokerTest, TraceServerReceieveTest001, TestSize.Level1) // li EXPECT_CALL(mock, GetDataSize).WillRepeatedly(Return(num + 8)); EXPECT_CALL(mock, ReadUint8).WillOnce(Return(num + 2)); EXPECT_CALL(mock, ReadUnpadBuffer).WillOnce(Return(&readUnpadBuffer)); - bool ret = HitraceInvoker::TraceServerReceieve(handle, code, data, flags); + bool ret = HitraceInvoker::TraceServerReceive(handle, code, data, flags); EXPECT_EQ(ret, true); } /** - * @tc.name: TraceServerReceieveTest002 - * @tc.desc: TraceServerReceieve + * @tc.name: TraceServerReceiveTest002 + * @tc.desc: TraceServerReceive * @tc.type: FUNC */ -HWTEST_F(HitraceInvokerTest, TraceServerReceieveTest002, TestSize.Level1) // line: 136 +HWTEST_F(HitraceInvokerTest, TraceServerReceiveTest002, TestSize.Level1) // line: 136 { NiceMock mock; int handle = 1; @@ -277,16 +277,16 @@ HWTEST_F(HitraceInvokerTest, TraceServerReceieveTest002, TestSize.Level1) // li EXPECT_CALL(mock, GetDataSize).WillRepeatedly(Return(num + 8)); EXPECT_CALL(mock, ReadUint8).WillOnce(Return(num + 2)); EXPECT_CALL(mock, ReadUnpadBuffer).WillOnce(Return(nullptr)); - bool ret = HitraceInvoker::TraceServerReceieve(handle, code, data, flags); + bool ret = HitraceInvoker::TraceServerReceive(handle, code, data, flags); EXPECT_EQ(ret, false); } /** - * @tc.name: TraceServerReceieveTest003 - * @tc.desc: TraceServerReceieve + * @tc.name: TraceServerReceiveTest003 + * @tc.desc: TraceServerReceive * @tc.type: FUNC */ -HWTEST_F(HitraceInvokerTest, TraceServerReceieveTest003, TestSize.Level1) // line: 154 +HWTEST_F(HitraceInvokerTest, TraceServerReceiveTest003, TestSize.Level1) // line: 154 { NiceMock mock; int handle = 1; @@ -297,7 +297,7 @@ HWTEST_F(HitraceInvokerTest, TraceServerReceieveTest003, TestSize.Level1) // li EXPECT_CALL(mock, GetDataSize).WillRepeatedly(Return(num + 8)); EXPECT_CALL(mock, ReadUint8).WillOnce(Return(num - 1)); - bool ret = HitraceInvoker::TraceServerReceieve(handle, code, data, flags); + bool ret = HitraceInvoker::TraceServerReceive(handle, code, data, flags); EXPECT_EQ(ret, true); } diff --git a/test/fuzztest/ipc/native/src/core/hitraceinvoker_fuzzer/hitraceinvoker_fuzzer.cpp b/test/fuzztest/ipc/native/src/core/hitraceinvoker_fuzzer/hitraceinvoker_fuzzer.cpp index b11668b54707aa0d248df1770be77fd8736c3d5f..8b86dd362fcb414a2a9378b734849cb7b344a2de 100644 --- a/test/fuzztest/ipc/native/src/core/hitraceinvoker_fuzzer/hitraceinvoker_fuzzer.cpp +++ b/test/fuzztest/ipc/native/src/core/hitraceinvoker_fuzzer/hitraceinvoker_fuzzer.cpp @@ -35,7 +35,7 @@ void TraceClientSendFuzzTest(FuzzedDataProvider &provider) HitraceInvoker::TraceClientSend(handle, code, data, flags, traceId); } -void TraceClientReceieveFuzzTest(FuzzedDataProvider &provider) +void TraceClientReceiveFuzzTest(FuzzedDataProvider &provider) { int32_t handle = provider.ConsumeIntegral(); uint32_t code = provider.ConsumeIntegral(); @@ -49,7 +49,7 @@ void TraceClientReceieveFuzzTest(FuzzedDataProvider &provider) id.parentSpanId = provider.ConsumeIntegral(); HiviewDFX::HiTraceId traceId(id); HiviewDFX::HiTraceId childId; - HitraceInvoker::TraceClientReceieve(handle, code, flags, traceId, childId); + HitraceInvoker::TraceClientReceive(handle, code, flags, traceId, childId); } void RecoveryDataAndFlagFuzzTest(FuzzedDataProvider &provider) @@ -64,7 +64,7 @@ void RecoveryDataAndFlagFuzzTest(FuzzedDataProvider &provider) HitraceInvoker::RecoveryDataAndFlag(data, flags, oldReadPosition, idLen); } -void TraceServerReceieveFuzzTest(FuzzedDataProvider &provider) +void TraceServerReceiveFuzzTest(FuzzedDataProvider &provider) { uint64_t handle = provider.ConsumeIntegral(); uint32_t code = provider.ConsumeIntegral(); @@ -73,7 +73,7 @@ void TraceServerReceieveFuzzTest(FuzzedDataProvider &provider) size_t size = provider.ConsumeIntegralInRange(1, 50); std::vector bytes = provider.ConsumeBytes(size); data.WriteBuffer(bytes.data(), bytes.size()); - HitraceInvoker::TraceServerReceieve(handle, code, data, flags); + HitraceInvoker::TraceServerReceive(handle, code, data, flags); } void TraceServerSendFuzzTest(FuzzedDataProvider &provider) @@ -93,9 +93,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) /* Run your code on data */ FuzzedDataProvider provider(data, size); OHOS::TraceClientSendFuzzTest(provider); - OHOS::TraceClientReceieveFuzzTest(provider); + OHOS::TraceClientReceiveFuzzTest(provider); OHOS::RecoveryDataAndFlagFuzzTest(provider); - OHOS::TraceServerReceieveFuzzTest(provider); + OHOS::TraceServerReceiveFuzzTest(provider); OHOS::TraceServerSendFuzzTest(provider); return 0; } diff --git a/test/fuzztest/ipc/native/src/mock/dbinderservicestubmock/dbinderservicestubmock001_fuzzer/dbinderservicestubmock001_fuzzer.cpp b/test/fuzztest/ipc/native/src/mock/dbinderservicestubmock/dbinderservicestubmock001_fuzzer/dbinderservicestubmock001_fuzzer.cpp index 1abbf316f78273258eb1001b990adecd8d9249eb..9416ccd6eb1f2a308ef2ff666a8ee2b2b6033984 100644 --- a/test/fuzztest/ipc/native/src/mock/dbinderservicestubmock/dbinderservicestubmock001_fuzzer/dbinderservicestubmock001_fuzzer.cpp +++ b/test/fuzztest/ipc/native/src/mock/dbinderservicestubmock/dbinderservicestubmock001_fuzzer/dbinderservicestubmock001_fuzzer.cpp @@ -33,6 +33,8 @@ using namespace testing::ext; namespace OHOS { static constexpr uint32_t DBINDER_HANDLE_BASE = 100000 * 6872; +static constexpr pid_t VALID_PID = 1; +static constexpr pid_t INVALID_PID = -1; const static size_t MAX_STRING_PARAM_LEN = 100; class DbinderServiceStub { @@ -275,13 +277,13 @@ void ProcessProtoFuzzTest001(FuzzedDataProvider &provider) binder_uintptr_t stub = reinterpret_cast(&dBinderServiceStub); dBinderService->AttachSessionObject(sessionInfo, stub); EXPECT_CALL(mock, GetInstance).WillOnce(Return(dBinderService)); - EXPECT_CALL(mock, GetCallingUid).WillOnce(Return(-1)); - EXPECT_CALL(mock, GetCallingPid).WillOnce(Return(-1)); + EXPECT_CALL(mock, GetCallingUid).WillOnce(Return(INVALID_PID)); + EXPECT_CALL(mock, GetCallingPid).WillOnce(Return(INVALID_PID)); dBinderServiceStub.ProcessProto(code, data, reply, option); EXPECT_CALL(mock, GetInstance).WillOnce(Return(dBinderService)); - EXPECT_CALL(mock, GetCallingUid).WillOnce(Return(1)); - EXPECT_CALL(mock, GetCallingPid).WillOnce(Return(1)); + EXPECT_CALL(mock, GetCallingUid).WillOnce(Return(VALID_PID)); + EXPECT_CALL(mock, GetCallingPid).WillOnce(Return(VALID_PID)); EXPECT_CALL(mock, CreateDatabusName).WillOnce(Return("DatabusName")); dBinderServiceStub.ProcessProto(code, data, reply, option); } @@ -309,8 +311,8 @@ void ProcessProtoFuzzTest002(FuzzedDataProvider &provider) MessageOption option; NiceMock mock; EXPECT_CALL(mock, GetInstance).WillRepeatedly(testing::Return(dBinderService)); - EXPECT_CALL(mock, GetCallingUid).WillRepeatedly(testing::Return(1)); - EXPECT_CALL(mock, GetCallingPid).WillRepeatedly(testing::Return(1)); + EXPECT_CALL(mock, GetCallingUid).WillRepeatedly(testing::Return(VALID_PID)); + EXPECT_CALL(mock, GetCallingPid).WillRepeatedly(testing::Return(VALID_PID)); EXPECT_CALL(mock, CreateDatabusName).WillRepeatedly(testing::Return("DatabusName")); EXPECT_CALL(mock, WriteUint32).WillRepeatedly(testing::Return(true)); EXPECT_CALL(mock, WriteUint64).WillRepeatedly(testing::Return(true)); diff --git a/test/fuzztest/ipc/native/src/mock/hitraceinvokermock/hitraceinvokermock001_fuzzer/hitraceinvokermock001_fuzzer.cpp b/test/fuzztest/ipc/native/src/mock/hitraceinvokermock/hitraceinvokermock001_fuzzer/hitraceinvokermock001_fuzzer.cpp index dd40281cafde7da1486614c7a0850e989cab7840..462e1e94470fbb6210a9301e152fc5398c797633 100644 --- a/test/fuzztest/ipc/native/src/mock/hitraceinvokermock/hitraceinvokermock001_fuzzer/hitraceinvokermock001_fuzzer.cpp +++ b/test/fuzztest/ipc/native/src/mock/hitraceinvokermock/hitraceinvokermock001_fuzzer/hitraceinvokermock001_fuzzer.cpp @@ -122,19 +122,17 @@ bool Parcel::WriteUint8(uint8_t value) } } -void TraceServerReceieveFuzzTest(FuzzedDataProvider &provider) +void TraceServerReceiveFuzzTest(FuzzedDataProvider &provider) { uint64_t handle = provider.ConsumeIntegral(); uint32_t code = provider.ConsumeIntegral(); uint32_t flags = 129; MessageParcel data; NiceMock mock; - size_t dataSize = HITRACE_ID_LEN + 8; - uint8_t idLen = HITRACE_ID_LEN + 2; - EXPECT_CALL(mock, GetDataSize).WillRepeatedly(Return(dataSize)); - EXPECT_CALL(mock, ReadUint8).WillOnce(Return(idLen)); + EXPECT_CALL(mock, GetDataSize).WillRepeatedly(Return(VALID_SIZE)); + EXPECT_CALL(mock, ReadUint8).WillOnce(Return(VALID_LEN)); EXPECT_CALL(mock, ReadUnpadBuffer).WillOnce(Return(nullptr)); - HitraceInvoker::TraceServerReceieve(handle, code, data, flags); + HitraceInvoker::TraceServerReceive(handle, code, data, flags); } void TraceClientSendFuzzTest(FuzzedDataProvider &provider) @@ -165,7 +163,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { /* Run your code on data */ FuzzedDataProvider provider(data, size); - OHOS::TraceServerReceieveFuzzTest(provider); + OHOS::TraceServerReceiveFuzzTest(provider); OHOS::TraceClientSendFuzzTest(provider); return 0; } diff --git a/test/fuzztest/ipc/native/src/mock/hitraceinvokermock/include/hitraceinvokermock_fuzzer.h b/test/fuzztest/ipc/native/src/mock/hitraceinvokermock/include/hitraceinvokermock_fuzzer.h index 6ab5e599df8af59537b217753f06ac4e545c71bc..5e513e0d79c7c12852a3894cbbd486be30b159c6 100644 --- a/test/fuzztest/ipc/native/src/mock/hitraceinvokermock/include/hitraceinvokermock_fuzzer.h +++ b/test/fuzztest/ipc/native/src/mock/hitraceinvokermock/include/hitraceinvokermock_fuzzer.h @@ -21,6 +21,11 @@ #include "hitrace_invoker.h" +namespace OHOS { +static constexpr size_t VALID_SIZE = HITRACE_ID_LEN + 8; +static constexpr uint8_t VALID_LEN = HITRACE_ID_LEN + 2; +} // namespace OHOS + #define FUZZ_PROJECT_NAME "hitraceinvokermock_fuzzer" #endif \ No newline at end of file diff --git a/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/include/ipcobjectstubmock_fuzzer.h b/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/include/ipcobjectstubmock_fuzzer.h index 895dd175f794d0339276e55e7755bbc0e077059f..0c052b30c3b0ba069714b46964625ab5ba9b1b01 100644 --- a/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/include/ipcobjectstubmock_fuzzer.h +++ b/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/include/ipcobjectstubmock_fuzzer.h @@ -16,6 +16,11 @@ #ifndef IPCOBJECTSTUBMOCK_FUZZER_H #define IPCOBJECTSTUBMOCK_FUZZER_H +namespace OHOS { +static constexpr uint32_t MIN_BYTE_SIZE = 1; +static constexpr uint32_t MAX_BYTE_SIZE = 50; +} // namespace OHOS + #define FUZZ_PROJECT_NAME "ipcobjectstubmock_fuzzer" #endif // IPCOBJECTSTUBMOCK_FUZZER_H \ No newline at end of file diff --git a/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock001_fuzzer/ipcobjectstubmock001_fuzzer.cpp b/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock001_fuzzer/ipcobjectstubmock001_fuzzer.cpp index ee3825748542faa6c67672beaa77165cd6316a2d..32ce9db004e2b3353af4663a30f91dd36ada28b3 100644 --- a/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock001_fuzzer/ipcobjectstubmock001_fuzzer.cpp +++ b/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock001_fuzzer/ipcobjectstubmock001_fuzzer.cpp @@ -96,7 +96,7 @@ static void DBinderPingTransactionFuzzTest(FuzzedDataProvider &provider) uint32_t code = provider.ConsumeIntegral(); MessageParcel data; MessageParcel reply; - size_t bytesSize = provider.ConsumeIntegralInRange(1, 50); + size_t bytesSize = provider.ConsumeIntegralInRange(MIN_BYTE_SIZE, MAX_BYTE_SIZE); std::vector bytes = provider.ConsumeBytes(bytesSize); reply.WriteBuffer(bytes.data(), bytes.size()); MessageOption option; @@ -111,12 +111,12 @@ static void DBinderSearchDescriptorFuzzTest(FuzzedDataProvider &provider) uint32_t code = provider.ConsumeIntegral(); MessageParcel data; MessageParcel reply; - size_t bytesSize = provider.ConsumeIntegralInRange(1, 50); + size_t bytesSize = provider.ConsumeIntegralInRange(MIN_BYTE_SIZE, MAX_BYTE_SIZE); std::vector bytes = provider.ConsumeBytes(bytesSize); reply.WriteBuffer(bytes.data(), bytes.size()); MessageOption option; NiceMock mockClient; - EXPECT_CALL(mockClient, WriteString16).WillRepeatedly(Return(0)); + EXPECT_CALL(mockClient, WriteString16).WillRepeatedly(Return(false)); IPCObjectStub ipcObjectStub; ipcObjectStub.DBinderSearchDescriptor(code, data, reply, option); } diff --git a/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock002_fuzzer/ipcobjectstubmock002_fuzzer.cpp b/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock002_fuzzer/ipcobjectstubmock002_fuzzer.cpp index 86c3958043a0552d38b76d2ee59eb178a8ed7d6e..bd571c02840ca905acfec56040d9951a5c3f72ff 100644 --- a/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock002_fuzzer/ipcobjectstubmock002_fuzzer.cpp +++ b/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock002_fuzzer/ipcobjectstubmock002_fuzzer.cpp @@ -148,7 +148,7 @@ static void DBinderGetSessionNameFuzzTest003(FuzzedDataProvider &provider) MessageOption option; NiceMock mockClient; EXPECT_CALL(mockClient, IsLocalCalling).WillRepeatedly(Return(true)); - EXPECT_CALL(mockClient, GetSessionName).WillRepeatedly(Return("sessionname")); + EXPECT_CALL(mockClient, GetSessionName).WillRepeatedly(Return("sessionName")); EXPECT_CALL(mockClient, WriteString).WillRepeatedly(Return(false)); IPCObjectStub ipcObjectStub; ipcObjectStub.DBinderGetSessionName(code, data, reply, option); diff --git a/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock004_fuzzer/ipcobjectstubmock004_fuzzer.cpp b/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock004_fuzzer/ipcobjectstubmock004_fuzzer.cpp index b9665120e74a3c50da9d2d49d09e37e133935b1c..3059036558fce9328a1a6e2af0e552f29b106fc0 100644 --- a/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock004_fuzzer/ipcobjectstubmock004_fuzzer.cpp +++ b/test/fuzztest/ipc/native/src/mock/ipcobjectstubmock/ipcobjectstubmock004_fuzzer/ipcobjectstubmock004_fuzzer.cpp @@ -131,11 +131,11 @@ static void SendRequestFuzzTest001(FuzzedDataProvider &provider) { uint32_t code = provider.ConsumeIntegral(); MessageParcel data; - size_t dataBytesSize = provider.ConsumeIntegralInRange(1, 50); + size_t dataBytesSize = provider.ConsumeIntegralInRange(MIN_BYTE_SIZE, MAX_BYTE_SIZE); std::vector dataBytes = provider.ConsumeBytes(dataBytesSize); data.WriteBuffer(dataBytes.data(), dataBytes.size()); MessageParcel reply; - size_t replyBytesSize = provider.ConsumeIntegralInRange(1, 50); + size_t replyBytesSize = provider.ConsumeIntegralInRange(MIN_BYTE_SIZE, MAX_BYTE_SIZE); std::vector replyBytes = provider.ConsumeBytes(replyBytesSize); reply.WriteBuffer(replyBytes.data(), replyBytes.size()); MessageOption option; @@ -146,11 +146,11 @@ static void SendRequestFuzzTest001(FuzzedDataProvider &provider) static void SendRequestFuzzTest002(FuzzedDataProvider &provider) { MessageParcel data; - size_t dataBytesSize = provider.ConsumeIntegralInRange(1, 50); + size_t dataBytesSize = provider.ConsumeIntegralInRange(MIN_BYTE_SIZE, MAX_BYTE_SIZE); std::vector dataBytes = provider.ConsumeBytes(dataBytesSize); data.WriteBuffer(dataBytes.data(), dataBytes.size()); MessageParcel reply; - size_t replyBytesSize = provider.ConsumeIntegralInRange(1, 50); + size_t replyBytesSize = provider.ConsumeIntegralInRange(MIN_BYTE_SIZE, MAX_BYTE_SIZE); std::vector replyBytes = provider.ConsumeBytes(replyBytesSize); reply.WriteBuffer(replyBytes.data(), replyBytes.size()); MessageOption option;