From 795e7b91bba51de5d711f9170d4a18a2e7914c6e Mon Sep 17 00:00:00 2001 From: wangkailong Date: Fri, 25 Aug 2023 14:58:21 +0800 Subject: [PATCH] safe1 Signed-off-by: wangkailong Change-Id: I53ad7ad646e4343f94c31659f74ccb624055879a --- services/abilitymgr/src/ability_manager_stub.cpp | 4 ++++ services/abilitymgr/src/acquire_share_data_callback_stub.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index 22bcd8320f3..2231c1a23b1 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -2065,6 +2065,10 @@ int AbilityManagerStub::ShareDataDoneInner(MessageParcel &data, MessageParcel &r int32_t resultCode = data.ReadInt32(); int32_t uniqueId = data.ReadInt32(); std::shared_ptr wantParam(data.ReadParcelable()); + if (!wantParam) { + HILOG_ERROR("wantParam read failed."); + return ERR_INVALID_VALUE; + } int32_t result = ShareDataDone(token, resultCode, uniqueId, *wantParam); if (!reply.WriteInt32(result)) { HILOG_ERROR("reply write failed."); diff --git a/services/abilitymgr/src/acquire_share_data_callback_stub.cpp b/services/abilitymgr/src/acquire_share_data_callback_stub.cpp index d6a797c2e12..c7523995ff5 100644 --- a/services/abilitymgr/src/acquire_share_data_callback_stub.cpp +++ b/services/abilitymgr/src/acquire_share_data_callback_stub.cpp @@ -52,6 +52,10 @@ int32_t AcquireShareDataCallbackStub::AcquireShareDataDoneInner(MessageParcel &d { int32_t resultCode = data.ReadInt32(); std::shared_ptr wantParam(data.ReadParcelable()); + if (wantParam == nullptr) { + HILOG_ERROR("wantParam is nullptr"); + return ERR_INVALID_VALUE; + } return AcquireShareDataDone(resultCode, *wantParam); } -- Gitee