From 4c6d2e0da73370da0cb7188c493444b02e67d29e Mon Sep 17 00:00:00 2001 From: tgotic Date: Thu, 4 Aug 2022 16:49:55 +0200 Subject: [PATCH 1/2] bt member typo Terminate sec_event.cfm_req.bd_name string, not sec_event.pin_req.bd_name --- components/bt/host/bluedroid/bta/dm/bta_dm_act.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c index e0a781647f..d0a858de2d 100644 --- a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c +++ b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c @@ -2908,7 +2908,7 @@ static UINT8 bta_dm_authorize_cback (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_NA if (p_result && p_result->status == BTM_SUCCESS) { BCM_STRNCPY_S((char *)sec_event.cfm_req.bd_name, (char *)p_result->remote_bd_name, BD_NAME_LEN); - sec_event.pin_req.bd_name[BD_NAME_LEN] = '\0'; + sec_event.cfm_req.bd_name[BD_NAME_LEN] = '\0'; } else { /* No name found */ sec_event.cfm_req.bd_name[0] = '\0'; } From fdf7029078cfe96084cc69d260fad85ecb70c7d6 Mon Sep 17 00:00:00 2001 From: linruihao Date: Mon, 8 Aug 2022 15:17:26 +0800 Subject: [PATCH 2/2] Fixed union member access typo Closes https://github.com/espressif/esp-idf/pull/9498 --- components/bt/host/bluedroid/bta/dm/bta_dm_act.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c index d0a858de2d..664f1963d9 100644 --- a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c +++ b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c @@ -2913,7 +2913,7 @@ static UINT8 bta_dm_authorize_cback (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_NA sec_event.cfm_req.bd_name[0] = '\0'; } - sec_event.key_notif.passkey = bta_dm_cb.num_val; /* get PIN code numeric number */ + sec_event.cfm_req.num_val = bta_dm_cb.num_val; /* get PIN code numeric number */ /* 1 additional event data fields for this event */ sec_event.cfm_req.just_works = bta_dm_cb.just_works;