blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-13 11:09:12 -04:00
Code Issues Projects Releases Wiki Activity

Protocomm/simple_ble: Make gatt table map size equal to number of handles received (v4.2)

Browse Source 
- Fixes memcpy failure observed while adding 2 or more endpoints in
  wifi_provisioning.

 Closes IDF-2250
This commit is contained in:
Prasad Alatkar 2020-10-09 15:53:47 +05:30
parent 511965b269
commit 6928e6b5b0
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/protocomm/src/simple_ble/simple_ble.c
View File

@ -23,12 +23,12 @@
#include "simple_ble.h" #include "simple_ble.h"
#define SIMPLE_BLE_MAX_GATT_TABLE_SIZE 20 static uint16_t g_ble_max_gatt_table_size;
static const char *TAG = "simple_ble"; static const char *TAG = "simple_ble";
static simple_ble_cfg_t *g_ble_cfg_p; static simple_ble_cfg_t *g_ble_cfg_p;
static uint16_t g_gatt_table_map[SIMPLE_BLE_MAX_GATT_TABLE_SIZE]; static uint16_t *g_gatt_table_map;
static uint8_t adv_config_done; static uint8_t adv_config_done;
#define adv_config_flag (1 << 0) #define adv_config_flag (1 << 0)
@ -38,7 +38,7 @@ const uint8_t *simple_ble_get_uuid128(uint16_t handle)
{ {
const uint8_t *uuid128_ptr; const uint8_t *uuid128_ptr;
for (int i = 0; i < SIMPLE_BLE_MAX_GATT_TABLE_SIZE; i++) { for (int i = 0; i < g_ble_max_gatt_table_size; i++) {
if (g_gatt_table_map[i] == handle) { if (g_gatt_table_map[i] == handle) {
uuid128_ptr = (const uint8_t *) g_ble_cfg_p->gatt_db[i].att_desc.uuid_p; uuid128_ptr = (const uint8_t *) g_ble_cfg_p->gatt_db[i].att_desc.uuid_p;
return uuid128_ptr; return uuid128_ptr;
@ -159,6 +159,13 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_
ESP_LOGE(TAG, "created attribute table abnormally "); ESP_LOGE(TAG, "created attribute table abnormally ");
} else { } else {
ESP_LOGD(TAG, "created attribute table successfully, the number handle = %d", param->add_attr_tab.num_handle); ESP_LOGD(TAG, "created attribute table successfully, the number handle = %d", param->add_attr_tab.num_handle);
g_gatt_table_map = (uint16_t *) calloc(param->add_attr_tab.num_handle, sizeof(uint16_t));
if (g_gatt_table_map == NULL) {
ESP_LOGE(TAG, "Memory allocation for GATT_TABLE_MAP failed ");
break;
}
/* Update g_ble_max_gatt_table_size with number of handles */
g_ble_max_gatt_table_size = param->add_attr_tab.num_handle;
memcpy(g_gatt_table_map, param->add_attr_tab.handles, param->add_attr_tab.num_handle * sizeof(g_gatt_table_map[0])); memcpy(g_gatt_table_map, param->add_attr_tab.handles, param->add_attr_tab.num_handle * sizeof(g_gatt_table_map[0]));
/* We assume, for now, that the first entry is always the index to the 'service' definition */ /* We assume, for now, that the first entry is always the index to the 'service' definition */
esp_ble_gatts_start_service(g_gatt_table_map[0]); esp_ble_gatts_start_service(g_gatt_table_map[0]);
@ -191,8 +198,14 @@ simple_ble_cfg_t *simple_ble_init(void)
esp_err_t simple_ble_deinit(void) esp_err_t simple_ble_deinit(void)
{ {
free(g_ble_cfg_p->gatt_db); free(g_ble_cfg_p->gatt_db);
g_ble_cfg_p->gatt_db = NULL;
free(g_ble_cfg_p); free(g_ble_cfg_p);
g_ble_cfg_p = NULL; g_ble_cfg_p = NULL;
free(g_gatt_table_map);
g_gatt_table_map = NULL;
g_ble_max_gatt_table_size = 0;
return ESP_OK; return ESP_OK;
} }