diff --git a/services/group_manager/src/group_operation/group_operation_common.c b/services/group_manager/src/group_operation/group_operation_common.c index 491c843..e429f73 100644 --- a/services/group_manager/src/group_operation/group_operation_common.c +++ b/services/group_manager/src/group_operation/group_operation_common.c @@ -705,9 +705,9 @@ int32_t AddUdidToParams(TrustedDeviceEntry *devParams) int32_t AddAuthIdToParamsOrDefault(const CJson *jsonParams, TrustedDeviceEntry *devParams) { const char *authId = GetStringFromJson(jsonParams, FIELD_DEVICE_ID); + char udid[INPUT_UDID_LEN] = { 0 }; if (authId == NULL) { LOGD("No authId is found. The default value is udid!"); - char udid[INPUT_UDID_LEN] = { 0 }; int32_t res = HcGetUdid((uint8_t *)udid, INPUT_UDID_LEN); if (res != HC_SUCCESS) { LOGE("Failed to get local udid! res: %d", res); @@ -983,7 +983,7 @@ int32_t ProcessKeyPair(int action, const CJson *jsonParams, const char *groupId) LOGE("Failed to get local udid! res: %d", res); return HC_ERR_DB; } - authId = (char *)udid; + authId = udid; } int32_t userType = DEVICE_TYPE_ACCESSORY; (void)GetIntFromJson(jsonParams, FIELD_USER_TYPE, &userType); diff --git a/services/group_manager/src/session/bind_session/bind_session_common.c b/services/group_manager/src/session/bind_session/bind_session_common.c index 2e52a03..0d9a6d8 100644 --- a/services/group_manager/src/session/bind_session/bind_session_common.c +++ b/services/group_manager/src/session/bind_session/bind_session_common.c @@ -486,18 +486,15 @@ static int32_t AddAuthIdAndUserTypeIfValidOrDefault(int32_t osAccountId, const c return HC_ERR_INVALID_PARAMS; } const char *authId = GetStringFromJson(jsonParams, FIELD_DEVICE_ID); + char udid[INPUT_UDID_LEN] = { 0 }; if (authId == NULL) { LOGD("No authId is found. The default value is udid!"); - char udid[INPUT_UDID_LEN] = { 0 }; int32_t res = HcGetUdid((uint8_t *)udid, INPUT_UDID_LEN); if (res != HC_SUCCESS) { LOGE("Failed to get local udid! res: %d", res); return HC_ERR_DB; } authId = udid; - if (authId == NULL) { - return HC_ERR_DB; - } } int32_t result = CheckAuthIdAndUserTypeValid(osAccountId, userType, groupId, authId); if (result != HC_SUCCESS) {