From 73806ccc22888fe7b9a836939c3db28d47e5bbaa Mon Sep 17 00:00:00 2001 From: huangxiaolinabc123 Date: Thu, 28 Jul 2022 11:31:17 +0800 Subject: [PATCH] modify samgr Signed-off-by: huangxiaolinabc123 Change-Id: Ic0f710cbcf0574a9afed33da469bfa19c394f37e --- samgr_client/source/remote_register_rpc.c | 3 ++- samgr_server/source/samgr_server_rpc.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/samgr_client/source/remote_register_rpc.c b/samgr_client/source/remote_register_rpc.c index 5a630dd..9fbfe26 100644 --- a/samgr_client/source/remote_register_rpc.c +++ b/samgr_client/source/remote_register_rpc.c @@ -43,7 +43,8 @@ static BOOL g_isAbilityInited = FALSE; int SAMGR_RegisterServiceApi(const char *service, const char *feature, const Identity *identity, IUnknown *iUnknown) { - if (service == NULL) { + if (service == NULL) { + return EC_INVALID; } ClientInitializeRegistry(); diff --git a/samgr_server/source/samgr_server_rpc.c b/samgr_server/source/samgr_server_rpc.c index a4b417f..9741447 100644 --- a/samgr_server/source/samgr_server_rpc.c +++ b/samgr_server/source/samgr_server_rpc.c @@ -115,8 +115,8 @@ SaNode *GetSaNodeBySaId(uintptr_t saId) { SaNode *node = NULL; SaNode *retNode = NULL; - pthread_mutex_lock(&g_saMutex); + UTILS_DL_LIST_FOR_EACH_ENTRY(node, &g_saList, SaNode, list) { if (node->saId == saId) { -- Gitee