From 763f9c91a45994f0f1883cffffb5f9362eeda5fe 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 7e2b85a7d6..d9ebdc29e1 100644 --- a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c +++ b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c @@ -2923,7 +2923,7 @@ static UINT8 bta_dm_authorize_cback (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_NA bytes_to_copy = (p_result->length < (BD_NAME_LEN - 1)) ? p_result->length : (BD_NAME_LEN - 1); memcpy(sec_event.cfm_req.bd_name, p_result->remote_bd_name, bytes_to_copy); - sec_event.pin_req.bd_name[BD_NAME_LEN - 1] = 0; + sec_event.cfm_req.bd_name[BD_NAME_LEN - 1] = 0; } else { /* No name found */ sec_event.cfm_req.bd_name[0] = 0; } From 6ad7114a453ee1ce3f72677813dda34dce67ed5f 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 d9ebdc29e1..54bed173bd 100644 --- a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c +++ b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c @@ -2928,7 +2928,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;