openharmony/miscservices_pasteboard
1
0
Fork 0
mirror of https://github.com/openharmony/miscservices_pasteboard.git synced 2026-07-19 17:13:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

指针判空保护

Browse Source 
Signed-off-by: chenyu <chenyu301@huawei.com>
This commit is contained in:
chenyu
2022-05-28 16:50:03 +08:00
parent 40682f0520
commit 9cf28fa4a6
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/kits/napi/src/napi_pasteboard.cpp
+4 -4
View File
@@ -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);
services/zidl/src/pasteboard_service_proxy.cpp
+8
View File
@@ -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())) {