diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/sinkserviceinitsink_fuzzer.cpp b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/sinkserviceinitsink_fuzzer.cpp index 59e3dbbf1aa1f583dcaf5f0e2e3993935227c432..4a561726d65a12bbd15232355940f3c4277ecffe 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/sinkserviceinitsink_fuzzer.cpp +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/sinkserviceinitsink_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -28,6 +28,10 @@ namespace OHOS { namespace DistributedHardware { +namespace { +const int32_t SINK_FUZZ_TEST_SLEEP = 200000; +} + void SinkServiceInitSinkFuzzTest(const uint8_t* data, size_t size) { if ((data == nullptr) || (size == 0)) { @@ -44,6 +48,7 @@ void SinkServiceInitSinkFuzzTest(const uint8_t* data, size_t size) sinkDevice->accessControl_ = std::make_shared(); sinkDevice->controller_ = std::make_shared(sinkDevice->accessControl_, sinkCallback); sinkService->InitSink(param, sinkCallback); + usleep(SINK_FUZZ_TEST_SLEEP); } } } diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp index ac006831cffc7b25df0b6011301f6b14c18699c1..ff5da5bb1b09f4c4feb4fc1729832413ddd7973c 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp @@ -40,7 +40,9 @@ DCameraSinkDataProcess::~DCameraSinkDataProcess() if ((eventHandler_ != nullptr) && (eventHandler_->GetEventRunner() != nullptr)) { eventHandler_->GetEventRunner()->Stop(); } - eventThread_.join(); + if (eventThread_.joinable()) { + eventThread_.join(); + } eventHandler_ = nullptr; }