diff --git a/interfaces/kits/napi/src/napi_pasteboard.cpp b/interfaces/kits/napi/src/napi_pasteboard.cpp index cd530b1..8be2294 100644 --- a/interfaces/kits/napi/src/napi_pasteboard.cpp +++ b/interfaces/kits/napi/src/napi_pasteboard.cpp @@ -482,10 +482,10 @@ napi_value SystemPasteboardNapi::Off(napi_env env, napi_callback_info info) NAPI_ASSERT(env, valueType == napi_function, "Wrong argument type. Function expected."); napi_create_reference(env, argv[ARGC_TYPE_SET1], 1, &ref); observer = GetPasteboardObserverIns(ref); - if (!observer) { - PASTEBOARD_HILOGI(PASTEBOARD_MODULE_JS_NAPI, "Callback is invalid"); - return nullptr; - } + } + if (!observer) { + PASTEBOARD_HILOGI(PASTEBOARD_MODULE_JS_NAPI, "Callback is invalid"); + return nullptr; } observer->setOff(); PasteboardClient::GetInstance()->RemovePasteboardChangedObserver(observer); diff --git a/services/zidl/src/pasteboard_service_proxy.cpp b/services/zidl/src/pasteboard_service_proxy.cpp index 6a62e38..acec998 100644 --- a/services/zidl/src/pasteboard_service_proxy.cpp +++ b/services/zidl/src/pasteboard_service_proxy.cpp @@ -43,6 +43,10 @@ void PasteboardServiceProxy::Clear() void PasteboardServiceProxy::AddPasteboardChangedObserver(const sptr& observer) { PASTEBOARD_HILOGD(PASTEBOARD_MODULE_CLIENT, "start."); + if(observer == nullptr){ + PASTEBOARD_HILOGE(PASTEBOARD_MODULE_CLIENT, "observer nullptr"); + return; + } MessageParcel data, reply; MessageOption option; if (!data.WriteInterfaceToken(GetDescriptor())) { @@ -63,6 +67,10 @@ void PasteboardServiceProxy::AddPasteboardChangedObserver(const sptr& observer) { PASTEBOARD_HILOGD(PASTEBOARD_MODULE_CLIENT, "start."); + if(observer == nullptr){ + PASTEBOARD_HILOGE(PASTEBOARD_MODULE_CLIENT, "observer nullptr"); + return; + } MessageParcel data, reply; MessageOption option; if (!data.WriteInterfaceToken(GetDescriptor())) {