diff --git a/frameworks/js/camera_napi/src/output/photo_output_napi.cpp b/frameworks/js/camera_napi/src/output/photo_output_napi.cpp index 5d88421312c8253a6de1cec546478de2db40ee1b..c18c50a71000b9b9918b199b5500200471d0a5ae 100644 --- a/frameworks/js/camera_napi/src/output/photo_output_napi.cpp +++ b/frameworks/js/camera_napi/src/output/photo_output_napi.cpp @@ -1257,6 +1257,8 @@ napi_value PhotoOutputNapi::EnableMovingPhoto(napi_env env, napi_callback_info i status = napi_unwrap(env, thisVar, reinterpret_cast(&photoOutputNapi)); CHECK_RETURN_RET_ELOG(status != napi_ok || photoOutputNapi == nullptr, result, "PhotoOutputNapi::EnableMovingPhoto photoOutputNapi is null!"); + CHECK_RETURN_RET_ELOG(photoOutputNapi->GetPhotoOutput() == nullptr, result, + "photoOutputNapi->GetPhotoOutput() is nullptr"); auto session = photoOutputNapi->GetPhotoOutput()->GetSession(); if (session != nullptr) { bool isEnableMovingPhoto; diff --git a/frameworks/native/camera/base/src/session/capture_session.cpp b/frameworks/native/camera/base/src/session/capture_session.cpp index b400435f010f97d864485b694eee39c921423178..0980e1030337b0f1977d05a4243ae68e34414fa0 100644 --- a/frameworks/native/camera/base/src/session/capture_session.cpp +++ b/frameworks/native/camera/base/src/session/capture_session.cpp @@ -805,6 +805,8 @@ int32_t CaptureSession::ConfigurePhotoOutput(sptr& output) int32_t CaptureSession::ConfigureVideoOutput(sptr& output) { MEDIA_INFO_LOG("CaptureSession::ConfigureVideoOutput enter"); + CHECK_RETURN_RET_ELOG(output == nullptr, CameraErrorCode::SERVICE_FATL_ERROR, + "CaptureSession::ConfigureVideoOutput output is nullptr"); auto videoProfile = output->GetVideoProfile(); if (output->IsTagSetted(CaptureOutput::DYNAMIC_PROFILE)) { CHECK_RETURN_RET_ELOG(videoProfile != nullptr, CameraErrorCode::SERVICE_FATL_ERROR, diff --git a/frameworks/native/camera/test/unittest/framework_native/output/src/capture_output_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/output/src/capture_output_unittest.cpp index c2be82f12ac670c6cfe21929127d738ec863ea60..1dea408d1cee47a68100ee71f179b667a5ead6e6 100644 --- a/frameworks/native/camera/test/unittest/framework_native/output/src/capture_output_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/output/src/capture_output_unittest.cpp @@ -70,8 +70,11 @@ void CameraCaptureOutputUnit::TearDown() sptr CameraCaptureOutputUnit::CreatePhotoOutput(int32_t width, int32_t height) { std::vector photoProfile = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } auto outputCapability = cameraManager_->GetSupportedOutputCapability(cameras[0], 0); diff --git a/frameworks/native/camera/test/unittest/framework_native/output/src/photo_output_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/output/src/photo_output_unittest.cpp index 8ee4ece77d4a64b51976bed3b14749328eac3d7b..06ca55d456fbcd4c8ee5af9cfaa7d3a4a98e4caf 100644 --- a/frameworks/native/camera/test/unittest/framework_native/output/src/photo_output_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/output/src/photo_output_unittest.cpp @@ -71,8 +71,11 @@ void CameraPhotoOutputUnit::TearDown() sptr CameraPhotoOutputUnit::CreatePhotoOutput() { std::vector photoProfile = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } auto outputCapability = cameraManager_->GetSupportedOutputCapability(cameras[0], 0); diff --git a/frameworks/native/camera/test/unittest/framework_native/output/src/video_output_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/output/src/video_output_unittest.cpp index 1325a1b9847f202e6ab711f175c547f6b8d5ccea..9f6c68c06ef015559fba42b25b21eacaa12fd3c0 100644 --- a/frameworks/native/camera/test/unittest/framework_native/output/src/video_output_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/output/src/video_output_unittest.cpp @@ -70,8 +70,11 @@ void CameraVedioOutputUnit::TearDown() sptr CameraVedioOutputUnit::CreateVideoOutput() { std::vector profile = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } auto outputCapability = cameraManager_->GetSupportedOutputCapability(cameras[0], 0); diff --git a/frameworks/native/camera/test/unittest/framework_native/session/src/night_session_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/session/src/night_session_unittest.cpp index 864616d4318c67b40c924e9e36705adf8e4a7fc6..a6e7fb6d54ee9b11f78425762cdc295bc79f3d6b 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/src/night_session_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/session/src/night_session_unittest.cpp @@ -42,8 +42,11 @@ namespace CameraStandard { sptr CameraNightSessionUnit::CreatePreviewOutput() { previewProfile_ = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } preIsSupportedNighitmode_ = false; @@ -79,8 +82,11 @@ sptr CameraNightSessionUnit::CreatePreviewOutput() sptr CameraNightSessionUnit::CreatePhotoOutput() { photoProfile_ = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } phoIsSupportedNighitmode_ = false; diff --git a/frameworks/native/camera/test/unittest/framework_native/session/src/portrait_session_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/session/src/portrait_session_unittest.cpp index 552d62e61c927c709a84460fc35200985eff3195..640d83eb284f2b7aecd751ded8115d11ccd64ce6 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/src/portrait_session_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/session/src/portrait_session_unittest.cpp @@ -168,8 +168,11 @@ void CameraPortraitSessionUnitTest::PortraitSessionBeautyParams(sptr CameraPortraitSessionUnitTest::CreatePreviewOutput() { previewProfile_ = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } preIsSupportedPortraitmode_ = false; @@ -205,8 +208,11 @@ sptr CameraPortraitSessionUnitTest::CreatePreviewOutput() sptr CameraPortraitSessionUnitTest::CreatePhotoOutput() { photoProfile_ = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } phoIsSupportedPortraitmode_ = false; diff --git a/frameworks/native/camera/test/unittest/framework_native/session/src/scan_session_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/session/src/scan_session_unittest.cpp index 754bce407bf4473cce0ce097afda7f62351b77c0..56a04681a6fc0932692fc66d1aee56fca6643eb0 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/src/scan_session_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/session/src/scan_session_unittest.cpp @@ -85,8 +85,11 @@ sptr CameraScanSessionUnitTest::CreatePreviewOutput() sptr CameraScanSessionUnitTest::CreatePhotoOutput() { photoProfile_ = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } phoIsSupportedScanmode_ = false; diff --git a/frameworks/native/camera/test/unittest/framework_native/session/src/secure_camera_session_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/session/src/secure_camera_session_unittest.cpp index f14dd2c9031225b3af940a87798c8755169244de..366264dfaf9763e6df9e4fccec05564672fe70af 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/src/secure_camera_session_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/session/src/secure_camera_session_unittest.cpp @@ -42,8 +42,11 @@ using namespace OHOS::HDI::Camera::V1_1; sptr SecureCameraSessionUnitTest::CreatePreviewOutput() { previewProfile_ = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } preIsSupportedSecuremode_ = false; diff --git a/frameworks/native/camera/test/unittest/framework_native/session/src/slow_motion_session_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/session/src/slow_motion_session_unittest.cpp index b81574723682c0be92c9ab8c84d0421afff603ee..7a0eea36e43c32ce39959fe2afa56a4e8af098e6 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/src/slow_motion_session_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/session/src/slow_motion_session_unittest.cpp @@ -72,8 +72,11 @@ void CameraSlowMotionSessionUnitTest::TearDown() sptr CameraSlowMotionSessionUnitTest::CreatePreviewOutput() { previewProfile_ = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } preIsSupportedSlowmode_ = false; @@ -118,8 +121,11 @@ sptr CameraSlowMotionSessionUnitTest::CreatePreviewOutput() sptr CameraSlowMotionSessionUnitTest::CreateVideoOutput() { profile_ = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } vidIsSupportedSlowmode_ = false; diff --git a/services/camera_service/src/camera_beauty_notification.cpp b/services/camera_service/src/camera_beauty_notification.cpp index c7aa3226e7b7185ee37bb8486fff421652ee9fc2..82d3a1c133ccc8b4f4398a7d17dc4def85f3d982 100644 --- a/services/camera_service/src/camera_beauty_notification.cpp +++ b/services/camera_service/src/camera_beauty_notification.cpp @@ -52,6 +52,7 @@ void CameraBeautyNotification::PublishNotification(bool isRecordTimes) std::shared_ptr cameraNotificationProxy = CameraNotificationProxy::CreateCameraNotificationProxy(); + CHECK_RETURN_ELOG(cameraNotificationProxy == nullptr, "cameraNotificationProxy is nullptr."); int32_t ret = cameraNotificationProxy->PublishBeautyNotification(isRecordTimes, beautyStatus, beautyTimes); MEDIA_INFO_LOG("CameraBeautyNotification::PublishNotification result = %{public}d", ret); isNotificationSuccess_ = (ret == CAMERA_OK); @@ -69,6 +70,7 @@ void CameraBeautyNotification::CancelNotification() std::shared_ptr cameraNotificationProxy = CameraNotificationProxy::CreateCameraNotificationProxy(); + CHECK_RETURN_ELOG(cameraNotificationProxy == nullptr, "cameraNotificationProxy is nullptr"); int32_t ret = cameraNotificationProxy->CancelBeautyNotification(); MEDIA_INFO_LOG("CameraBeautyNotification::CancelNotification result = %{public}d", ret); } diff --git a/test/fuzztest/portraitsession_fuzzer/portrait_session_fuzzer.cpp b/test/fuzztest/portraitsession_fuzzer/portrait_session_fuzzer.cpp index c736b926a4f050636c90e49869bae6e02913536a..7d88217feaa1cede851cb36c84a8411ecf35b3f1 100644 --- a/test/fuzztest/portraitsession_fuzzer/portrait_session_fuzzer.cpp +++ b/test/fuzztest/portraitsession_fuzzer/portrait_session_fuzzer.cpp @@ -49,8 +49,11 @@ bool g_phoIsSupportedPortraitmode = false; sptr CreatePreviewOutput() { previewProfile_ = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } g_preIsSupportedPortraitmode = false; @@ -86,8 +89,11 @@ sptr CreatePreviewOutput() sptr CreatePhotoOutput() { photoProfile_ = {}; + if (!cameraManager_) { + return nullptr; + } std::vector> cameras = cameraManager_->GetCameraDeviceListFromServer(); - if (!cameraManager_ || cameras.empty()) { + if (cameras.empty()) { return nullptr; } g_phoIsSupportedPortraitmode = false;