Better cleanup on mount failures, as the idf api now seems to assign handle and mountpoint before failing. Fixes #3265 (#3282)

lbernstone · me-no-dev · commit f8c06894c5ff · 2019-09-26T19:12:52.000+03:00
diff --git a/libraries/FFat/src/FFat.cpp b/libraries/FFat/src/FFat.cpp
@@ -58,6 +58,8 @@ bool F_Fat::begin(bool formatOnFail, const char * basePath, uint8_t maxOpenFiles
     esp_err_t err = esp_vfs_fat_spiflash_mount(basePath, partitionLabel, &conf, &_wl_handle);
     if(err){
         log_e("Mounting FFat partition failed! Error: %d", err);
+        esp_vfs_fat_spiflash_unmount(basePath, _wl_handle);
+        _wl_handle = WL_INVALID_HANDLE;
         return false;
     }
     _impl->mountpoint(basePath);

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ bool F_Fat::begin(bool formatOnFail, const char * basePath, uint8_t maxOpenFiles`
`58`	`58`	`esp_err_t err = esp_vfs_fat_spiflash_mount(basePath, partitionLabel, &conf, &_wl_handle);`
`59`	`59`	`if(err){`
`60`	`60`	`log_e("Mounting FFat partition failed! Error: %d", err);`
	`61`	`+ esp_vfs_fat_spiflash_unmount(basePath, _wl_handle);`
	`62`	`+ _wl_handle = WL_INVALID_HANDLE;`
`61`	`63`	`return false;`
`62`	`64`	`}`
`63`	`65`	`_impl->mountpoint(basePath);`