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

Merge pull request #52 from sjanc/scan_fix

Browse Source 
nimble/ll: Fix dereferencing NULL pointer in ble_ll_scan_rx_isr_end
This commit is contained in:
Szymon Janc
2018-04-18 13:27:18 +02:00
committed by GitHub
parent 49b0dd67d6 1a7e3d1204
commit d378f3d04f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_scan.c
+6 -4
View File
@@ -2002,11 +2002,7 @@ ble_ll_scan_rx_isr_end(struct os_mbuf *rxpdu, uint8_t crcok)
/* Get scanning state machine */
scansm = &g_ble_ll_scan_sm;
scanphy = &scansm->phy_data[scansm->cur_phy];
ble_hdr = BLE_MBUF_HDR_PTR(rxpdu);
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
ble_hdr->rxinfo.user_data = scansm->cur_aux_data;
#endif
/*
* The reason we do something different here (as opposed to failed CRC) is
* that the received PDU will not be handed up in this case. So we have
@@ -2024,6 +2020,12 @@ ble_ll_scan_rx_isr_end(struct os_mbuf *rxpdu, uint8_t crcok)
return 0;
}
ble_hdr = BLE_MBUF_HDR_PTR(rxpdu);
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
ble_hdr->rxinfo.user_data = scansm->cur_aux_data;
#endif
/* Just leave if the CRC is not OK. */
rc = -1;
if (!crcok) {