Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-07 20:17:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

buttons extension + config memory leak & external allocation

Browse Source
This commit is contained in:
philippe44
2020-01-14 23:29:19 -08:00
parent ccf214fbe2
commit f8b5d856a3
6 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/config/config.c
View File

@@ -69,7 +69,7 @@ void config_set_entry_changed_flag(cJSON * entry, cJSON_bool flag);
void * pval = config_alloc_get(nt, key);\
if(pval!=NULL){ *value = *(t * )pval; free(pval); return ESP_OK; }\
return ESP_FAIL;}
#ifdef RECOVERY_APPLICATION
#if RECOVERY_APPLICATION==0
static void * malloc_fn(size_t sz){
void * ptr = heap_caps_malloc(sz, MALLOC_CAP_SPIRAM);
@@ -80,7 +80,7 @@ static void * malloc_fn(size_t sz){
}
static void * free_fn(void * ptr){
if(ptr!=NULL){
free(ptr);
heap_caps_free(ptr);
}
else {
ESP_LOGW(TAG,"free_fn: Cannot free null pointer!");
@@ -92,7 +92,7 @@ void init_cJSON(){
static cJSON_Hooks hooks;
// initialize cJSON hooks it uses SPIRAM memory
// as opposed to IRAM
#ifndef RECOVERY_APPLICATION
#if RECOVERY_APPLICATION==0
// In squeezelite mode, allocate memory from PSRAM. Otherwise allocate from internal RAM
// as recovery will lock flash access when erasing FLASH or writing to OTA partition.
hooks.malloc_fn=&malloc_fn;
@@ -228,6 +228,8 @@ cJSON * config_set_value_safe(nvs_type_t nvs_type, const char *key, void * value
}
else {
ESP_LOGD(TAG, "Config not changed. ");
cJSON_Delete(entry);
entry = existing;
}
}
else {
@@ -697,7 +699,6 @@ esp_err_t config_set_value(nvs_type_t nvs_type, const char *key, void * value){
else {
ESP_LOGV(TAG,"config_set_value completed");
}
}
config_unlock();
return result;