diff --git a/samgr_client/source/remote_register_rpc.c b/samgr_client/source/remote_register_rpc.c index 5a630dd94d706f11546902240da9e4dae2e8eedd..9fbfe26909816f4bf41e694e2df1a8fd71bee009 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 a4b417f50e6758192ba014b6302cf678fd5f7e00..97414479f87cde435b79362afd7764a3791ba794 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) {