ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed memory leak when files/dirs error 

Error path did not clean up after itself correctly
pull/5538/head
Christopher Haster 2017-11-16 12:06:59 -06:00
parent 9f8d0d6ae8
commit 7eaf61c047
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LittleFileSystem.cpp
View File

@ -332,12 +332,16 @@ int LittleFileSystem::stat(const char *name, struct stat *st) {
////// File operations ////// ////// File operations //////
int LittleFileSystem::file_open(fs_file_t *file, const char *path, int flags) { int LittleFileSystem::file_open(fs_file_t *file, const char *path, int flags) {
lfs_file_t *f = new lfs_file_t; lfs_file_t *f = new lfs_file_t;
*file = f;
_mutex.lock(); _mutex.lock();
LFS_INFO("file_open(%p, \"%s\", 0x%x)", *file, path, flags); LFS_INFO("file_open(%p, \"%s\", 0x%x)", *file, path, flags);
int err = lfs_file_open(&_lfs, f, path, lfs_fromflags(flags)); int err = lfs_file_open(&_lfs, f, path, lfs_fromflags(flags));
LFS_INFO("file_open -> %d", lfs_toerror(err)); LFS_INFO("file_open -> %d", lfs_toerror(err));
_mutex.unlock(); _mutex.unlock();
if (!err) {
*file = f;
} else {
delete f;
}
return lfs_toerror(err); return lfs_toerror(err);
} }
@ -416,12 +420,16 @@ off_t LittleFileSystem::file_size(fs_file_t file) {
////// Dir operations ////// ////// Dir operations //////
int LittleFileSystem::dir_open(fs_dir_t *dir, const char *path) { int LittleFileSystem::dir_open(fs_dir_t *dir, const char *path) {
lfs_dir_t *d = new lfs_dir_t; lfs_dir_t *d = new lfs_dir_t;
*dir = d;
_mutex.lock(); _mutex.lock();
LFS_INFO("dir_open(%p, \"%s\")", *dir, path); LFS_INFO("dir_open(%p, \"%s\")", *dir, path);
int err = lfs_dir_open(&_lfs, d, path); int err = lfs_dir_open(&_lfs, d, path);
LFS_INFO("dir_open -> %d", lfs_toerror(err)); LFS_INFO("dir_open -> %d", lfs_toerror(err));
_mutex.unlock(); _mutex.unlock();
if (!err) {
*dir = d;
} else {
delete d;
}
return lfs_toerror(err); return lfs_toerror(err);
} }