espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/config_parse_crash_after_flash_erase_v4.1' into 'release/v4.1'

Browse Source 
component_bt: fixed config parse crash after flash_erase(v4.1)

See merge request espressif/esp-idf!16732
This commit is contained in:
Wang Meng Yang
2022-02-18 05:01:40 +00:00
parent e3433724cc f5516d661c
commit 605fb98948
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/common/osi/config.c
View File

@ -550,10 +550,12 @@ static void config_parse(nvs_handle_t fp, config_t *config)
const size_t keyname_bufsz = sizeof(CONFIG_KEY) + 5 + 1; // including log10(sizeof(i)) const size_t keyname_bufsz = sizeof(CONFIG_KEY) + 5 + 1; // including log10(sizeof(i))
char *keyname = osi_calloc(keyname_bufsz); char *keyname = osi_calloc(keyname_bufsz);
int buf_size = get_config_size_from_flash(fp); int buf_size = get_config_size_from_flash(fp);
char *buf = osi_calloc(buf_size); char *buf = NULL;
if(buf_size == 0) { //First use nvs if(buf_size == 0) { //First use nvs
goto error; goto error;
} }
buf = osi_calloc(buf_size);
if (!line || !section || !buf || !keyname) { if (!line || !section || !buf || !keyname) {
err_code |= 0x01; err_code |= 0x01;
goto error; goto error;