espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-08-03 00:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nimble/fix_nvs_peer_dev_bug' into 'nimble-1.3.0-idf'

Browse Source 
NimBLE NVS: Fix bug in deletion of peer_dev_record

See merge request espressif/esp-nimble!70
This commit is contained in:
Hrishikesh Dhayagude
2021-04-19 10:04:59 +00:00
parent 1b808fcb80 09ccbf3966
commit 04d00bc46f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_hs_resolv.c
+1 -1
View File
@@ -96,7 +96,7 @@ ble_rpa_remove_peer_dev_rec(struct ble_hs_dev_records *p_dev_rec)
ble_store_num_peer_dev_rec--;
if ((i != ble_store_num_peer_dev_rec) && (ble_store_num_peer_dev_rec != 0)) {
memmove(&peer_dev_rec[i], &peer_dev_rec[i + 1],
(ble_store_num_peer_dev_rec - i + 1) * sizeof(struct ble_hs_dev_records ));
(ble_store_num_peer_dev_rec - i) * sizeof(struct ble_hs_dev_records ));
}
BLE_HS_LOG(DEBUG, " RPA: removed device at index = %d, no. of peer records"
nimble/host/store/config/src/ble_store_nvs.c
+4 -2
View File
@@ -212,8 +212,10 @@ get_nvs_db_attribute(int obj_type, bool empty, void *value, int num_value)
if (value) {
#if MYNEWT_VAL(BLE_HOST_BASED_PRIVACY)
if (obj_type == BLE_STORE_OBJ_TYPE_PEER_DEV_REC) {
err = get_nvs_matching_index(&p_dev_rec, value, num_value,
sizeof(struct ble_hs_dev_records));
err = get_nvs_matching_index(&p_dev_rec.peer_sec,
&((struct ble_hs_dev_records *)value)->peer_sec,
num_value,
sizeof(struct ble_hs_peer_sec));
} else
#endif
{