From 7bb774cf56d769664e585d767a0f326ae7fd21c4 Mon Sep 17 00:00:00 2001
From: byndyx <baiyanan2@huawei.com>
Date: Wed, 7 Aug 2024 10:47:10 +0800
Subject: [PATCH] add check null

Signed-off-by: byndyx <baiyanan2@huawei.com>
---
 .../cameraservice/cameraoperator/client/src/dcamera_client.cpp  | 2 ++
 .../src/distributedcameramgr/dcamera_sink_controller.cpp        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp
index 79a8a42a..f99a23e7 100644
--- a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp
+++ b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp
@@ -143,6 +143,7 @@ void DCameraClient::UpdateSettingCache(const std::string& metadataStr)
 void DCameraClient::FindCameraMetadata(const std::string& metadataStr)
 {
     std::shared_ptr<Camera::CameraMetadata> cameraMetadata = Camera::MetadataUtils::DecodeFromString(metadataStr);
+    CHECK_AND_RETURN_LOG(cameraMetadata == nullptr, "FindCameraMetadata get cameraMetadata is null");
     camera_metadata_item_t focusItem;
     int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_CONTROL_FOCUS_MODE, &focusItem);
     if (ret == CAM_META_SUCCESS) {
@@ -584,6 +585,7 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr<DCameraCaptureInfo>& inf
 void DCameraClient::SetPhotoCaptureRotation(const std::shared_ptr<Camera::CameraMetadata>& cameraMetadata,
     std::shared_ptr<CameraStandard::PhotoCaptureSetting>& photoCaptureSetting)
 {
+    CHECK_AND_RETURN_LOG(cameraMetadata == nullptr, "SetPhotoCaptureRotation param cameraMetadata is null");
     uint32_t rotationCount = 1;
     camera_metadata_item_t item;
     int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_ORIENTATION, &item);
diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp
index 573ed2ce..7b258cc9 100644
--- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp
+++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp
@@ -400,6 +400,7 @@ void DCameraSinkController::ProcessFrameTrigger(const AppExecFwk::InnerEvent::Po
 {
     DHLOGD("Receive frame trigger event then start process data in sink controller.");
     std::shared_ptr<std::string> param = event->GetSharedObject<std::string>();
+    CHECK_AND_RETURN_LOG(param == nullptr, "ProcessFrameTrigger get param is null");
     accessControl_->TriggerFrame(*param);
 }
 
@@ -408,6 +409,7 @@ void DCameraSinkController::ProcessPostAuthorization(const AppExecFwk::InnerEven
     DHLOGD("Receive post authorization event then start process data in sink controller.");
     std::shared_ptr<std::vector<std::shared_ptr<DCameraCaptureInfo>>> captureInfos =
         event->GetSharedObject<std::vector<std::shared_ptr<DCameraCaptureInfo>>>();
+    CHECK_AND_RETURN_LOG(captureInfos == nullptr, "ProcessPostAuthorization get captureInfos is null");
     PostAuthorization(*captureInfos);
 }
 
-- 
Gitee