espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-06-06 05:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nimble) Explicitly NULL assign adv data

Browse Source
This commit is contained in:
Rahul Tank
2024-06-03 16:00:08 +05:30
parent df505acaa0
commit d53c988a93
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_gap.c
+12 -4
View File
@@ -1189,9 +1189,8 @@ int ble_gap_slave_adv_reattempt(void)
rc = ble_gap_ext_adv_set_data(ble_adv_reattempt.instance, ble_adv_reattempt.data);
if (rc != 0) {
os_mbuf_free_chain(ble_adv_reattempt.data);
return rc;
}
return rc;
}
rc = ble_gap_ext_adv_start(ble_adv_reattempt.instance, ble_adv_reattempt.duration,
ble_adv_reattempt.max_events);
@@ -3863,7 +3862,8 @@ ble_gap_ext_adv_set_data(uint8_t instance, struct os_mbuf *data)
ble_adv_reattempt.data = os_msys_get_pkthdr(len , 0);
}
if (ble_adv_reattempt.data) {
if (ble_adv_reattempt.data && (ble_adv_reattempt.data != data)) {
os_mbuf_adj(ble_adv_reattempt.data, len);
rc = os_mbuf_appendfrom(ble_adv_reattempt.data, data, 0, len);
assert (rc == 0);
}
@@ -3881,7 +3881,15 @@ ble_gap_ext_adv_set_data(uint8_t instance, struct os_mbuf *data)
ble_hs_unlock();
done:
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT)
if (ble_adv_reattempt.data != data) {
os_mbuf_free_chain(data);
data = NULL;
}
#else
os_mbuf_free_chain(data);
data = NULL;
#endif
return rc;
}