From 9dbd9bb0ba53669338b7a0a83ea56bcbdac64c07 Mon Sep 17 00:00:00 2001 From: wangchaole Date: Tue, 23 Aug 2022 20:07:45 +0800 Subject: [PATCH] fix: Solve the asan version fuzz problem Signed-off-by: wangchaole --- .../include/dcamera_source_handler.h | 2 +- .../src/dcamera_source_handler.cpp | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h index 09d278f6..c5f85e5f 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h @@ -45,7 +45,7 @@ private: DCAMERA_SA_STATE_STOP = 0, DCAMERA_SA_STATE_START = 1, } DCameraSAState; - DCameraSourceHandler() = default; + DCameraSourceHandler(); ~DCameraSourceHandler(); void FinishStartSA(const std::string ¶ms); void FinishStartSAFailed(int32_t systemAbilityId); diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index 0cbb17a8..5c520b2b 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp @@ -30,6 +30,12 @@ namespace OHOS { namespace DistributedHardware { IMPLEMENT_SINGLE_INSTANCE(DCameraSourceHandler); +DCameraSourceHandler::DCameraSourceHandler() +{ + DHLOGI("DCameraSourceHandler construct."); + callback_ = new DCameraSourceCallback(); +} + DCameraSourceHandler::~DCameraSourceHandler() { DHLOGI("~DCameraSourceHandler"); @@ -72,11 +78,6 @@ void DCameraSourceHandler::FinishStartSA(const std::string ¶ms) return; } - callback_ = new DCameraSourceCallback(); - if (callback_ == nullptr) { - DHLOGE("DCameraSourceHandler InitSource init callback failed"); - return; - } dCameraSourceSrv->InitSource(params, callback_); std::unique_lock lock(producerMutex_); state_ = DCAMERA_SA_STATE_START; @@ -122,10 +123,6 @@ int32_t DCameraSourceHandler::RegisterDistributedHardware(const std::string& dev std::lock_guard autoLock(optLock_); std::string reqId = GetRandomID(); - if (callback_ == nullptr) { - DHLOGE("DCameraSourceHandler RegisterDistributedHardware DCameraSourceCallback is null."); - return DCAMERA_BAD_VALUE; - } callback_->PushRegCallback(reqId, callback); int32_t ret = dCameraSourceSrv->RegisterDistributedHardware(devId, dhId, reqId, param); if (ret != DCAMERA_OK) { @@ -150,10 +147,6 @@ int32_t DCameraSourceHandler::UnregisterDistributedHardware(const std::string& d std::lock_guard autoLock(optLock_); std::string reqId = GetRandomID(); - if (callback_ == nullptr) { - DHLOGE("DCameraSourceHandler RegisterDistributedHardware DCameraSourceCallback is null."); - return DCAMERA_BAD_VALUE; - } callback_->PushUnregCallback(reqId, callback); int32_t ret = dCameraSourceSrv->UnregisterDistributedHardware(devId, dhId, reqId); if (ret != DCAMERA_OK) { -- Gitee