feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/nvs_memory_issue' into 'master'

Browse Source 
bugfix(nvs_flash): fixed potential memory leak in nvs::Storage::init()

Closes IDF-6481

See merge request espressif/esp-idf!21619
This commit is contained in:
David Čermák
2022-12-15 23:46:42 +08:00
parent 7283a406e4 e6ca481623
commit 52cfc01655
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/nvs_flash/src/nvs_storage.cpp
View File

@@ -116,12 +116,14 @@ esp_err_t Storage::init(uint32_t baseSector, uint32_t sectorCount)
item.getKey(entry->mName, sizeof(entry->mName)); item.getKey(entry->mName, sizeof(entry->mName));
err = item.getValue(entry->mIndex); err = item.getValue(entry->mIndex);
if (err != ESP_OK) { if (err != ESP_OK) {
delete entry;
return err; return err;
} }
mNamespaces.push_back(entry);
if (mNamespaceUsage.set(entry->mIndex, true) != ESP_OK) { if (mNamespaceUsage.set(entry->mIndex, true) != ESP_OK) {
delete entry;
return ESP_FAIL; return ESP_FAIL;
} }
mNamespaces.push_back(entry);
itemIndex += item.span; itemIndex += item.span;
} }
} }