Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/nvs-deinit-open-handle-leak_v6.1' into 'release/v6.1'

Browse Source 
fix(nvs_flash): delete leftover handles on partition deinit (v6.1)

See merge request espressif/esp-idf!51354
This commit is contained in:
Jiang Jiang Jian
2026-08-31 11:26:26 +08:00
parent 0773a8d8bb 49a52f5b68
commit e045076539
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/nvs_flash/host_test/nvs_host_test/main/test_nvs.cpp
+21
View File
@@ -899,6 +899,27 @@ TEST_CASE("deinit partition doesn't affect other partition's open handles", "[nv
TEST_ESP_OK(nvs_flash_deinit_partition(TEST_SECONDARY_PARTITION_NAME));
}
TEST_CASE("deinit with open handles frees them", "[nvs]")
{
// nvs_flash_deinit_partition must delete leftover open
// handles (same as nvs_close), not only erase them from the C API handle list.
TEST_ESP_OK(nvs_flash_erase_partition(TEST_3SEC_PARTITION_NAME));
TEST_ESP_OK(nvs_flash_init_partition(TEST_3SEC_PARTITION_NAME));
nvs_handle_t handle_1;
nvs_handle_t handle_2;
TEST_ESP_OK(nvs_open_from_partition(TEST_3SEC_PARTITION_NAME, "ns1", NVS_READWRITE, &handle_1));
TEST_ESP_OK(nvs_open_from_partition(TEST_3SEC_PARTITION_NAME, "ns2", NVS_READWRITE, &handle_2));
CHECK(nvs::NVSPartitionManager::get_instance()->open_handles_size() == 2);
TEST_ESP_OK(nvs_flash_deinit_partition(TEST_3SEC_PARTITION_NAME));
CHECK(nvs::NVSPartitionManager::get_instance()->open_handles_size() == 0);
// Stale handle ids must be harmless after deinit already freed the entries.
nvs_close(handle_1);
nvs_close(handle_2);
}
TEST_CASE("nvs iterator nvs_entry_find invalid parameter test", "[nvs]")
{
// TC verifies that nvs_entry_find returns ESP_ERR_INVALID_ARG on invalid parameters.