mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-22 06:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

att_db_util: fix realloc of att db buffer for large attributes

Browse Source
This commit is contained in:
Matthias Ringwald 2020-01-23 14:19:22 +01:00
parent 8d783ab1e6
commit 5c0b28ef04
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -11,7 +11,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed ### Fixed
- L2CAP ERTM: avoid read-after-free on decline of incoming connection - L2CAP ERTM: avoid read-after-free on decline of incoming connection
- GATT Client: set uuid16 to zero when deserializing uuid128 services, characteristics, and descriptors - GATT Client: set uuid16 to zero when deserializing uuid128 services, characteristics, and descriptors
- att_db_util: fix realloc of att db buffer for large attributes
### Added ### Added
- att_db_util: provide GATT Database Hash via att_db_util_hash_calc - att_db_util: provide GATT Database Hash via att_db_util_hash_calc
- GATT Compiler: provide GATT Database Hash via GATT_DATABASE_HASH Characteristic - GATT Compiler: provide GATT Database Hash via GATT_DATABASE_HASH Characteristic

17
src/ble/att_db_util.c
View File

@ -48,7 +48,10 @@
#include "bluetooth.h" #include "bluetooth.h"
// ATT DB Storage // ATT DB Storage
#ifndef HAVE_MALLOC #ifdef HAVE_MALLOC
// number of bytes that the att db buffer is increased on init / realloc
#define ATT_DB_BUFFER_INCREMENT 128
#else
#ifdef MAX_ATT_DB_SIZE #ifdef MAX_ATT_DB_SIZE
static uint8_t att_db_storage[MAX_ATT_DB_SIZE]; static uint8_t att_db_storage[MAX_ATT_DB_SIZE];
#else #else
@ -70,8 +73,8 @@ static void att_db_util_set_end_tag(void){
void att_db_util_init(void){ void att_db_util_init(void){
#ifdef HAVE_MALLOC #ifdef HAVE_MALLOC
att_db = (uint8_t*) malloc(128); att_db = (uint8_t*) malloc(ATT_DB_BUFFER_INCREMENT);
att_db_max_size = 128; att_db_max_size = ATT_DB_BUFFER_INCREMENT;
#else #else
att_db = att_db_storage; att_db = att_db_storage;
att_db_max_size = sizeof(att_db_storage); att_db_max_size = sizeof(att_db_storage);
@ -119,9 +122,13 @@ static bool att_db_util_hash_include_without_value(uint16_t uuid16){
*/ */
static int att_db_util_assert_space(uint16_t size){ static int att_db_util_assert_space(uint16_t size){
size += 2; // for end tag size += 2; // for end tag
if ((att_db_size + size) <= att_db_max_size) return 1; uint16_t required_size = att_db_size + size;
if (required_size <= att_db_max_size) return 1;
#ifdef HAVE_MALLOC #ifdef HAVE_MALLOC
int new_size = att_db_size + att_db_size / 2; uint16_t new_size = att_db_max_size;
while (new_size < required_size){
new_size += ATT_DB_BUFFER_INCREMENT
}
uint8_t * new_db = (uint8_t*) realloc(att_db, new_size); uint8_t * new_db = (uint8_t*) realloc(att_db, new_size);
if (!new_db) { if (!new_db) {
log_error("att_db: realloc failed"); log_error("att_db: realloc failed");