diff --git a/frameworks/js/camera_napi/src/input/camera_input_napi.cpp b/frameworks/js/camera_napi/src/input/camera_input_napi.cpp index d882b82897a908b6a47026aa49b1eb93588259f6..75cf5d463e56bb36aef839f583139b522a21c35f 100644 --- a/frameworks/js/camera_napi/src/input/camera_input_napi.cpp +++ b/frameworks/js/camera_napi/src/input/camera_input_napi.cpp @@ -298,12 +298,10 @@ void ConsumeWorkerQueueTask(CameraInputAsyncContext* context) void CameraInputNapi::OpenCameraAsync(uv_work_t* work) { - if (!work) { - MEDIA_ERR_LOG("OpenCameraAsync null work"); - return; - } + CHECK_ERROR_RETURN_LOG(work == nullptr, "OpenCameraAsync null work"); MEDIA_INFO_LOG("OpenCameraAsync running on worker"); auto context = static_cast(work->data); + CHECK_ERROR_RETURN_LOG(context == nullptr, "OpenCameraAsync context is null"); CHECK_ERROR_RETURN_LOG(context->objectInfo == nullptr, "OpenCameraAsync async info is nullptr"); CAMERA_START_ASYNC_TRACE(context->funcName, context->taskId); ConsumeWorkerQueueTask(context); @@ -311,6 +309,7 @@ void CameraInputNapi::OpenCameraAsync(uv_work_t* work) void CameraInputNapi::UvWorkAsyncCompleted(uv_work_t* work, int status) { + CHECK_ERROR_RETURN_LOG(work == nullptr, "UvWorkAsyncCompleted null work"); auto context = static_cast(work->data); CHECK_ERROR_RETURN_LOG(context == nullptr, "UvWorkAsyncCompleted context is null"); MEDIA_INFO_LOG("UvWorkAsyncCompleted %{public}s, status = %{public}d", context->funcName.c_str(), diff --git a/frameworks/js/camera_napi/src/session/camera_session_napi.cpp b/frameworks/js/camera_napi/src/session/camera_session_napi.cpp index 5e863065665adbaf3a30d6bf519a6d4a66d2cc56..9213d50fb0147acb62432f4a08b24dec0e60947a 100644 --- a/frameworks/js/camera_napi/src/session/camera_session_napi.cpp +++ b/frameworks/js/camera_napi/src/session/camera_session_napi.cpp @@ -970,12 +970,10 @@ napi_value CameraSessionNapi::BeginConfig(napi_env env, napi_callback_info info) void CameraSessionNapi::CommitConfigAsync(uv_work_t* work) { - if (!work) { - MEDIA_ERR_LOG("CommitConfigAsync null work"); - return; - } + CHECK_ERROR_RETURN_LOG(work == nullptr, "CommitConfigAsync null work"); MEDIA_INFO_LOG("CommitConfigAsync running on worker"); auto context = static_cast(work->data); + CHECK_ERROR_RETURN_LOG(context == nullptr, "CommitConfigAsync context is null"); CHECK_ERROR_RETURN_LOG( context->objectInfo == nullptr, "CommitConfigAsync async info is nullptr"); CAMERA_START_ASYNC_TRACE(context->funcName, context->taskId); @@ -988,6 +986,7 @@ void CameraSessionNapi::CommitConfigAsync(uv_work_t* work) void CameraSessionNapi::UvWorkAsyncCompleted(uv_work_t* work, int status) { + CHECK_ERROR_RETURN_LOG(work == nullptr, "UvWorkAsyncCompleted null work"); auto context = static_cast(work->data); CHECK_ERROR_RETURN_LOG(context == nullptr, "UvWorkAsyncCompleted context is null"); MEDIA_INFO_LOG("UvWorkAsyncCompleted %{public}s, status = %{public}d", context->funcName.c_str(), @@ -1337,12 +1336,10 @@ napi_value CameraSessionNapi::RemoveOutput(napi_env env, napi_callback_info info void CameraSessionNapi::StartAsync(uv_work_t* work) { - if (!work) { - MEDIA_ERR_LOG("StartAsync null work"); - return; - } + CHECK_ERROR_RETURN_LOG(work == nullptr, "StartAsync null work"); MEDIA_INFO_LOG("StartAsync running on worker"); auto context = static_cast(work->data); + CHECK_ERROR_RETURN_LOG(context == nullptr, "StartAsync context is null"); CHECK_ERROR_RETURN_LOG(context->objectInfo == nullptr, "StartAsync async info is nullptr"); CAMERA_START_ASYNC_TRACE(context->funcName, context->taskId); CameraNapiWorkerQueueKeeper::GetInstance()->ConsumeWorkerQueueTask(context->queueTask, [&context]() {