sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix an NXFFS memory leak

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3570 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-05-06 16:07:27 +00:00
parent 0f1bdb6ab2
commit 9801b4b31b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nxffs/nxffs_unlink.c
View File

@ -103,7 +103,8 @@ int nxffs_rminode(FAR struct nxffs_volume_s *volume, FAR const char *name)
/* We can't remove the inode if it is open */ /* We can't remove the inode if it is open */
fdbg("Inode '%s' is open\n", name); fdbg("Inode '%s' is open\n", name);
return -EBUSY; ret = -EBUSY;
goto errout;
} }
/* Find the NXFFS inode */ /* Find the NXFFS inode */
@ -112,7 +113,7 @@ int nxffs_rminode(FAR struct nxffs_volume_s *volume, FAR const char *name)
if (ret < 0) if (ret < 0)
{ {
fdbg("Inode '%s' not found\n", name); fdbg("Inode '%s' not found\n", name);
return ret; goto errout;
} }
/* Set the position to the FLASH offset of the file header (nxffs_findinode /* Set the position to the FLASH offset of the file header (nxffs_findinode
@ -127,7 +128,7 @@ int nxffs_rminode(FAR struct nxffs_volume_s *volume, FAR const char *name)
if (ret < 0) if (ret < 0)
{ {
fdbg("Failed to read data into cache: %d\n", ret); fdbg("Failed to read data into cache: %d\n", ret);
return ret; goto errout_with_entry;
} }
/* Change the file status... it is no longer valid */ /* Change the file status... it is no longer valid */
@ -141,10 +142,12 @@ int nxffs_rminode(FAR struct nxffs_volume_s *volume, FAR const char *name)
if (ret < 0) if (ret < 0)
{ {
fdbg("Failed to read data into cache: %d\n", ret); fdbg("Failed to read data into cache: %d\n", ret);
return ret;
} }
return OK; errout_with_entry:
nxffs_freeentry(&entry);
errout:
return ret;
} }
/**************************************************************************** /****************************************************************************