commit f33c62bf8842d82af642b27871a263d0a2c3f31c
author cdj <45139296+DejinChen@users.noreply.github.com> Wed May 08 03:15:24 2024 +0800
committer GitHub <noreply@github.com> Tue May 07 19:15:24 2024 +0000
tree 44a8fc50e2ec1613b61510a32a1715659f39f8be
parent 947dc7ca59a1d6411af0fdc33745043a94de1a3f

Fix crash for eps32 commissioner if ble disconnect during commissioning (#33332)

src/platform/ESP32/nimble/BLEManagerImpl.cpp

diff --git a/src/platform/ESP32/nimble/BLEManagerImpl.cpp b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
index b5d9e66..54219bf 100644
--- a/src/platform/ESP32/nimble/BLEManagerImpl.cpp
+++ b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
@@ -503,6 +503,10 @@
     uint8_t value[2];
     int rc;
     struct peer * peer = peer_find(conId);
+    if (peer == nullptr)
+    {
+        return false;
+    }
 
     dsc = peer_dsc_find_uuid(peer, (ble_uuid_t *) (&ShortUUID_CHIPoBLEService), (ble_uuid_t *) (&UUID_CHIPoBLEChar_TX),
                              (ble_uuid_t *) (&ShortUUID_CHIPoBLE_CharTx_Desc));
@@ -537,6 +541,10 @@
     uint8_t value[2];
     int rc;
     struct peer * peer = peer_find(conId);
+    if (peer == nullptr)
+    {
+        return false;
+    }
 
     dsc = peer_dsc_find_uuid(peer, (ble_uuid_t *) (&ShortUUID_CHIPoBLEService), (ble_uuid_t *) (&UUID_CHIPoBLEChar_TX),
                              (ble_uuid_t *) (&ShortUUID_CHIPoBLE_CharTx_Desc));