mirrors
/
blackmagic-esp32-s2
mirror of https://github.com/flipperdevices/blackmagic-esp32-s2.git
1
0
Fork 0
Code Releases Wiki Activity

Fix memleak in NVS save\load

This commit is contained in:
DrZlo13 2021-11-01 06:02:58 +10:00
parent 770b08099b
commit b6a582d86d
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
main/nvs.c
View File

@ -21,17 +21,21 @@ esp_err_t nvs_save_string(const char* key, const mstring_t* value) {
nvs_handle_t nvs_handle;
esp_err_t err;
err = nvs_open(NVS_STORE, NVS_READWRITE, &nvs_handle);
if(err != ESP_OK) return err;
do {
err = nvs_open(NVS_STORE, NVS_READWRITE, &nvs_handle);
if(err != ESP_OK) break;
err = nvs_set_str(nvs_handle, key, mstring_get_cstr(value));
if(err != ESP_OK) return err;
err = nvs_set_str(nvs_handle, key, mstring_get_cstr(value));
if(err != ESP_OK) break;
err = nvs_commit(nvs_handle);
if(err != ESP_OK) return err;
err = nvs_commit(nvs_handle);
if(err != ESP_OK) break;
nvs_close(nvs_handle);
return ESP_OK;
nvs_close(nvs_handle);
err = ESP_OK;
} while(0);
return err;
}
esp_err_t nvs_load_string(const char* key, mstring_t* value) {
@ -41,18 +45,17 @@ esp_err_t nvs_load_string(const char* key, mstring_t* value) {
do {
err = nvs_open(NVS_STORE, NVS_READWRITE, &nvs_handle);
if(err != ESP_OK) return err;
if(err != ESP_OK) break;
size_t required_size = 0;
err = nvs_get_str(nvs_handle, key, NULL, &required_size);
if(err != ESP_OK) return err;
if(err != ESP_OK) break;
buffer = malloc(required_size + sizeof(uint32_t));
err = nvs_get_str(nvs_handle, key, buffer, &required_size);
if(err != ESP_OK) return err;
if(err != ESP_OK) break;
mstring_set(value, buffer);
nvs_close(nvs_handle);
err = ESP_OK;
} while(0);