diff --git a/bundle.json b/bundle.json index ee9eb119907046173a4c136f2a8c11ece98b9b89..999cae5bb46da77bdb21a8b1e49e06a780ff0f25 100644 --- a/bundle.json +++ b/bundle.json @@ -50,7 +50,6 @@ "device_standby", "init", "power_manager", - "googletest", "runtime_core" ] }, @@ -100,4 +99,4 @@ ] } } -} +} \ No newline at end of file diff --git a/interfaces/inner_api/src/time_service_client.cpp b/interfaces/inner_api/src/time_service_client.cpp index 91f9b684a9669459f72661c97b5a63dc4241bdfe..ea018cefcbf7366d7b1084a2923bc96da358c707 100644 --- a/interfaces/inner_api/src/time_service_client.cpp +++ b/interfaces/inner_api/src/time_service_client.cpp @@ -891,10 +891,13 @@ void TimeServiceClient::SetProxy(sptr proxy) timeServiceProxy_ = proxy; } +// LCOV_EXCL_START +// The method has no input parameters, impossible to construct fuzz test. void TimeServiceClient::ClearProxy() { std::lock_guard autoLock(proxyLock_); timeServiceProxy_ = nullptr; } +// LCOV_EXCL_STOP } // namespace MiscServices } // namespace OHOS \ No newline at end of file diff --git a/services/time/src/sntp_client.cpp b/services/time/src/sntp_client.cpp index 99e778b81abc6a11ce7ebd5f848701f2249c289e..b8bb295fd7517a1d9f9662db4fda29aee2c58e82 100644 --- a/services/time/src/sntp_client.cpp +++ b/services/time/src/sntp_client.cpp @@ -317,6 +317,8 @@ void SNTPClient::SNTPMessage::clear() } } +// LCOV_EXCL_START +// The method has no input parameters, impossible to construct fuzz test. int64_t SNTPClient::getNtpTime() { return mNtpTime; @@ -331,5 +333,6 @@ int64_t SNTPClient::getRoundTripTime() { return mRoundTripTime; } +// LCOV_EXCL_STOP } // namespace MiscServices } // namespace OHOS \ No newline at end of file diff --git a/test/fuzztest/timemanager_fuzzer/timetesttimer_fuzzer/timetesttimer_fuzzer.cpp b/test/fuzztest/timemanager_fuzzer/timetesttimer_fuzzer/timetesttimer_fuzzer.cpp index c7844e63ecacff0a3c57c9c7b8e7c84bffea9e90..ba582b5a68ec04af242b8264c3472a378eaf679a 100644 --- a/test/fuzztest/timemanager_fuzzer/timetesttimer_fuzzer/timetesttimer_fuzzer.cpp +++ b/test/fuzztest/timemanager_fuzzer/timetesttimer_fuzzer/timetesttimer_fuzzer.cpp @@ -100,31 +100,11 @@ bool FuzzTimeDestroyTimerAsyncV9(int64_t timerId, size_t size) return true; } -bool FuzzTimeCheckNameLocked(const uint8_t* data, size_t size) -{ - std::string name(reinterpret_cast(data), size); - TimeServiceClient::GetInstance()->CheckNameLocked(name); - return true; -} - -bool FuzzTimeHandleRecoverMap(int64_t timerId, size_t size) -{ - TimeServiceClient::GetInstance()->HandleRecoverMap(timerId); - return true; -} - bool FuzzTimeResetAllProxy(int64_t timerId, size_t size) { TimeServiceClient::GetInstance()->ResetAllProxy(); return true; } - -bool FuzzTimeClearProxy(int64_t timerId, size_t size) -{ - TimeServiceClient::GetInstance()->ClearProxy(); - return true; -} - } /* Fuzzer entry point */ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) @@ -149,9 +129,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) OHOS::FuzzTimeDestroyTimerV9(timerId, size); OHOS::FuzzTimeDestroyTimerAsync(timerId, size); OHOS::FuzzTimeDestroyTimerAsyncV9(timerId, size); - OHOS::FuzzTimeCheckNameLocked(data, size); - OHOS::FuzzTimeHandleRecoverMap(timerId, size); OHOS::FuzzTimeResetAllProxy(timerId, size); - OHOS::FuzzTimeClearProxy(timerId, size); return 0; } \ No newline at end of file diff --git a/test/fuzztest/timeservice_fuzzer/timerproxy_fuzzer/timerproxy_fuzzer.cpp b/test/fuzztest/timeservice_fuzzer/timerproxy_fuzzer/timerproxy_fuzzer.cpp index e5f2971c84112444a8958a56ac89a64e303b75d2..a666a6fc6f6e54efa6e5d2b48e02097053d6b8db 100644 --- a/test/fuzztest/timeservice_fuzzer/timerproxy_fuzzer/timerproxy_fuzzer.cpp +++ b/test/fuzztest/timeservice_fuzzer/timerproxy_fuzzer/timerproxy_fuzzer.cpp @@ -97,14 +97,6 @@ bool FuzzTimerIsProxy(const uint8_t *data, size_t size) TimerProxy::GetInstance().IsProxy(uid, pid); return true; } - -bool FuzzTimerNotifyTimer(const uint8_t *data, size_t size) -{ - FuzzedDataProvider fdp(data, size); - uint64_t id = fdp.ConsumeIntegral(); - TimerCallback::GetInstance()->NotifyTimer(id); - return true; -} } // namespace OHOS /* Fuzzer entry point */ @@ -122,6 +114,5 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) OHOS::FuzzTimerEraseTimer(data, size); OHOS::FuzzTimerRemoveTimerMap(data, size); OHOS::FuzzTimerIsProxy(data, size); - OHOS::FuzzTimerNotifyTimer(data, size); return 0; } \ No newline at end of file diff --git a/test/fuzztest/timeservice_fuzzer/timesntp_fuzzer/timesntp_fuzzer.cpp b/test/fuzztest/timeservice_fuzzer/timesntp_fuzzer/timesntp_fuzzer.cpp index fb436547b5a0f9853f420fe055ffc6ac033e9b52..3ff40169901f9e5bba574b3c54c6caefcfbc50c6 100644 --- a/test/fuzztest/timeservice_fuzzer/timesntp_fuzzer/timesntp_fuzzer.cpp +++ b/test/fuzztest/timeservice_fuzzer/timesntp_fuzzer/timesntp_fuzzer.cpp @@ -70,28 +70,6 @@ bool FuzzTimeRequestTime(const uint8_t *data, size_t size) client.RequestTime(host); return true; } - -bool FuzzTimeGetNtpTime(const uint8_t *data, size_t size) -{ - SNTPClient client; - client.getNtpTime(); - return true; -} - -bool FuzzTimeGetNtpTimeReference(const uint8_t *data, size_t size) -{ - SNTPClient client; - client.getNtpTimeReference(); - return true; -} - -bool FuzzTimeGetRoundTripTime(const uint8_t *data, size_t size) -{ - SNTPClient client; - client.getRoundTripTime(); - return true; -} - } // namespace OHOS /* Fuzzer entry point */ @@ -105,8 +83,5 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) OHOS::FuzzTimeCreateMessage(data, size); OHOS::FuzzTimeReceivedMessage(data, size); OHOS::FuzzTimeRequestTime(data, size); - OHOS::FuzzTimeGetNtpTime(data, size); - OHOS::FuzzTimeGetNtpTimeReference(data, size); - OHOS::FuzzTimeGetRoundTripTime(data, size); return 0; } \ No newline at end of file diff --git a/utils/native/src/time_common.cpp b/utils/native/src/time_common.cpp index 5e9014aa449d7cdfb57bed88f858022f29241e14..a3dae2072ee4041ec97b7241110166f2a61d087d 100644 --- a/utils/native/src/time_common.cpp +++ b/utils/native/src/time_common.cpp @@ -46,6 +46,8 @@ int32_t TimeUtils::GetBootTimeNs(int64_t &time) return E_TIME_OK; } +// LCOV_EXCL_START +// The method has no input parameters, impossible to construct fuzz test. std::chrono::steady_clock::time_point TimeUtils::GetBootTimeNs() { int64_t timeNow = -1; @@ -57,6 +59,7 @@ std::chrono::steady_clock::time_point TimeUtils::GetBootTimeNs() std::chrono::steady_clock::time_point tp_epoch ((std::chrono::nanoseconds(timeNow))); return tp_epoch; } +// LCOV_EXCL_STOP int32_t TimeUtils::GetBootTimeMs(int64_t &time) {