fix(ble/bluedroid): Fixed fail to disconnect when device record is cleared

esp-zhp · esp-zhp · commit b6dc79af47f7 · 2025-07-25T10:30:11.000+08:00
diff --git a/components/bt/host/bluedroid/stack/btm/btm_acl.c b/components/bt/host/bluedroid/stack/btm/btm_acl.c
@@ -2519,8 +2519,7 @@ tBTM_STATUS btm_remove_acl (BD_ADDR bd_addr, tBT_TRANSPORT transport)
     } else  /* otherwise can disconnect right away */
 #endif
     {
-        if (hci_handle != 0xFFFF && p_dev_rec &&
-                p_dev_rec->sec_state != BTM_SEC_STATE_DISCONNECTING) {
+        if (hci_handle != 0xFFFF && (( p_dev_rec && p_dev_rec->sec_state != BTM_SEC_STATE_DISCONNECTING) || (!p_dev_rec))) {
             if (!btsnd_hcic_disconnect (hci_handle, HCI_ERR_PEER_USER)) {
                 status = BTM_NO_RESOURCES;
             }

Original file line number	Diff line number	Diff line change
`@@ -2519,8 +2519,7 @@ tBTM_STATUS btm_remove_acl (BD_ADDR bd_addr, tBT_TRANSPORT transport)`
`2519`	`2519`	`} else /* otherwise can disconnect right away */`
`2520`	`2520`	`#endif`
`2521`	`2521`	`{`
`2522`		`- if (hci_handle != 0xFFFF && p_dev_rec &&`
`2523`		`- p_dev_rec->sec_state != BTM_SEC_STATE_DISCONNECTING) {`
	`2522`	`+ if (hci_handle != 0xFFFF && (( p_dev_rec && p_dev_rec->sec_state != BTM_SEC_STATE_DISCONNECTING) \|\| (!p_dev_rec))) {`
`2524`	`2523`	`if (!btsnd_hcic_disconnect (hci_handle, HCI_ERR_PEER_USER)) {`
`2525`	`2524`	`status = BTM_NO_RESOURCES;`
`2526`	`2525`	`}`