Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

components/nvs: clear handles list on init, fix returning *length in nvs_get_{str,blob}

Browse source
This commit is contained in:
Ivan Grokhotkov 2016-08-22 11:58:13 +08:00
parent 35d50643bc
commit 7447d08605
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/nvs_flash/src/nvs_api.cpp
View file

@ -56,6 +56,7 @@ extern "C" esp_err_t nvs_flash_init(uint32_t baseSector, uint32_t sectorCount)
Lock::init(); Lock::init();
Lock lock; Lock lock;
NVS_DEBUGV("%s %d %d\r\n", __func__, baseSector, sectorCount); NVS_DEBUGV("%s %d %d\r\n", __func__, baseSector, sectorCount);
s_nvs_handles.clear();
return s_nvs_storage.init(baseSector, sectorCount); return s_nvs_storage.init(baseSector, sectorCount);
} }
@ -260,12 +261,15 @@ static esp_err_t nvs_get_str_or_blob(nvs_handle handle, nvs::ItemType type, cons
return err; return err;
} }
if (length != nullptr && out_value == nullptr) { if (length == nullptr) {
return ESP_ERR_NVS_INVALID_LENGTH;
}
else if (out_value == nullptr) {
*length = dataSize; *length = dataSize;
return ESP_OK; return ESP_OK;
} }
else if (*length < dataSize) {
if (length == nullptr || *length < dataSize) { *length = dataSize;
return ESP_ERR_NVS_INVALID_LENGTH; return ESP_ERR_NVS_INVALID_LENGTH;
} }