adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix potential CORRUPT HEAP problem on libraries/BLE/src/BLEDevice.cpp (#7597)

Browse source 
* Update BLEDevice.cpp

fix potential CORRUPT HEAP problem

* move mux to BLEDevice class
This commit is contained in:
Curry 2022-12-22 01:59:40 +08:00 committed by GitHub
parent 94fd529e36
commit bb8c8559b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/BLE/src/BLEDevice.cpp
View file

@ -629,10 +629,15 @@ void BLEDevice::addPeerDevice(void* peer, bool _client, uint16_t conn_id) {
m_connectedClientsMap.insert(std::pair<uint16_t, conn_status_t>(conn_id, status)); m_connectedClientsMap.insert(std::pair<uint16_t, conn_status_t>(conn_id, status));
} }
//there may have some situation that invoking this function simultaneously, that will cause CORRUPT HEAP
//let this function serializable
portMUX_TYPE BLEDevice::mux = portMUX_INITIALIZER_UNLOCKED;
void BLEDevice::removePeerDevice(uint16_t conn_id, bool _client) { void BLEDevice::removePeerDevice(uint16_t conn_id, bool _client) {
portENTER_CRITICAL(&mux);
log_i("remove: %d, GATT role %s", conn_id, _client?"client":"server"); log_i("remove: %d, GATT role %s", conn_id, _client?"client":"server");
if(m_connectedClientsMap.find(conn_id) != m_connectedClientsMap.end()) if(m_connectedClientsMap.find(conn_id) != m_connectedClientsMap.end())
m_connectedClientsMap.erase(conn_id); m_connectedClientsMap.erase(conn_id);
portEXIT_CRITICAL(&mux);
} }
/* multi connect support */ /* multi connect support */

1
libraries/BLE/src/BLEDevice.h
View file

@ -73,6 +73,7 @@ private:
static BLEAdvertising* m_bleAdvertising; static BLEAdvertising* m_bleAdvertising;
static esp_gatt_if_t getGattcIF(); static esp_gatt_if_t getGattcIF();
static std::map<uint16_t, conn_status_t> m_connectedClientsMap; static std::map<uint16_t, conn_status_t> m_connectedClientsMap;
static portMUX_TYPE mux;
static void gattClientEventHandler( static void gattClientEventHandler(
esp_gattc_cb_event_t event, esp_gattc_cb_event_t event,