blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 09:39:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/esp_vfs_fat_sdcard_format_workbuf_leak_v5.2' into 'release/v5.2'

Browse Source 
fix: esp_vfs_fat_sdcard_format workbuf memory leak (v5.2)

See merge request espressif/esp-idf!27503
This commit is contained in:
Jiang Jiang Jian 2023-12-04 11:03:21 +08:00
commit 7ee2470603
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/fatfs/vfs/vfs_fat_sdmmc.c
View File

@ -464,17 +464,20 @@ esp_err_t esp_vfs_fat_sdcard_format(const char *base_path, sdmmc_card_t *card)
return ESP_ERR_INVALID_STATE;
}
//unmount
char drv[3] = {(char)('0' + pdrv), ':', 0};
FRESULT res = f_mount(0, drv, 0);
if (res != FR_OK) {
ESP_LOGE(TAG, "f_mount unmount failed (%d)", res);
return ESP_FAIL;
}
const size_t workbuf_size = 4096;
void *workbuf = ff_memalloc(workbuf_size);
if (workbuf == NULL) {
return ESP_ERR_NO_MEM;
}
//unmount
char drv[3] = {(char)('0' + pdrv), ':', 0};
FRESULT res = f_mount(0, drv, 0);
ESP_RETURN_ON_FALSE(res != FR_INVALID_DRIVE, ESP_FAIL, TAG, "f_mount unmount failed (%d) - the logical drive number is invalid", res);
//format
uint32_t id = FF_VOLUMES;
bool found = s_get_context_id_by_card(card, &id);