Skip to content
Snippets Groups Projects
Commit 9801b4b3 authored by patacongo's avatar patacongo
Browse files

Fix an NXFFS memory leak

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3570 42af7a65-404d-4744-a932-0658087f49c3
parent 0f1bdb6a
No related branches found
No related tags found
No related merge requests found
......@@ -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 */
fdbg("Inode '%s' is open\n", name);
return -EBUSY;
ret = -EBUSY;
goto errout;
}
/* Find the NXFFS inode */
......@@ -112,7 +113,7 @@ int nxffs_rminode(FAR struct nxffs_volume_s *volume, FAR const char *name)
if (ret < 0)
{
fdbg("Inode '%s' not found\n", name);
return ret;
goto errout;
}
/* 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)
{
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 */
......@@ -141,10 +142,12 @@ int nxffs_rminode(FAR struct nxffs_volume_s *volume, FAR const char *name)
if (ret < 0)
{
fdbg("Failed to read data into cache: %d\n", ret);
return ret;
}
return OK;
errout_with_entry:
nxffs_freeentry(&entry);
errout:
return ret;
}
/****************************************************************************
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment