From 9cf28fa4a63e37411c730f593ad4aa53fd38c8f0 Mon Sep 17 00:00:00 2001
From: chenyu <chenyu301@huawei.com>
Date: Sat, 28 May 2022 16:50:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E9=92=88=E5=88=A4=E7=A9=BA=E4=BF=9D?=
 =?UTF-8?q?=E6=8A=A4=20Signed-off-by:=20chenyu=20<chenyu301@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 interfaces/kits/napi/src/napi_pasteboard.cpp   | 8 ++++----
 services/zidl/src/pasteboard_service_proxy.cpp | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

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<IPasteboardChangedObserver>& 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<IPasteboard
 void PasteboardServiceProxy::RemovePasteboardChangedObserver(const sptr<IPasteboardChangedObserver>& 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())) {