[mynewt-nimble] branch master updated: nimble/gap: Fix crash on create sync cancel

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new 494a163  nimble/gap: Fix crash on create sync cancel
494a163 is described below

commit 494a163582d28c40ea4946700ed951258b8e1a5b
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Wed Oct 23 21:52:25 2019 +0200

    nimble/gap: Fix crash on create sync cancel
    
    Cancelling create sync result in sync created event being generated
    with error status (similar to LE Create Connection). Clearing
    pending GAP op was triggering assert in event handler.
---
 nimble/host/src/ble_gap.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index 822f498..a3458e8 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -1370,7 +1370,7 @@ ble_gap_rx_scan_req_rcvd(const struct ble_hci_ev_le_subev_scan_req_rcvd *ev)
 void
 ble_gap_rx_peroidic_adv_sync_estab(const struct ble_hci_ev_le_subev_periodic_adv_sync_estab *ev)
 {
-    uint16_t sync_handle = le16toh(ev->sync_handle);
+    uint16_t sync_handle;
     struct ble_gap_event event;
     ble_gap_event_fn *cb;
     void *cb_arg;
@@ -1385,6 +1385,8 @@ ble_gap_rx_peroidic_adv_sync_estab(const struct ble_hci_ev_le_subev_periodic_adv
     BLE_HS_DBG_ASSERT(ble_gap_sync.psync);
 
     if (!ev->status) {
+        sync_handle = le16toh(ev->sync_handle);
+
         ble_gap_sync.psync->sync_handle = sync_handle;
         ble_gap_sync.psync->adv_sid = ev->sid;
         memcpy(ble_gap_sync.psync->advertiser_addr.val, ev->peer_addr, 6);
@@ -3505,14 +3507,6 @@ ble_gap_periodic_adv_create_sync_cancel(void)
 
     rc = ble_hs_hci_cmd_tx(opcode, NULL, 0, NULL, 0);
 
-    if (!rc) {
-        ble_gap_sync.op = BLE_GAP_OP_NULL;
-        ble_gap_sync.cb = NULL;
-        ble_gap_sync.cb_arg = NULL;
-        ble_hs_periodic_sync_free(ble_gap_sync.psync);
-        ble_gap_sync.psync = NULL;
-    }
-
     ble_hs_unlock();
 
     return rc;