2009-02-23 16:47:40

by Jim Meyering

Subject: [PATCH] * lib/ext2fs/dosio.c (dos_open): don't leak strdup'd dev name upon error

Signed-off-by: Jim Meyering <[email protected]>
---
Spotted by inspection.
For all I know, this is dead code ;-)

lib/ext2fs/dosio.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/lib/ext2fs/dosio.c b/lib/ext2fs/dosio.c
index 97ceef5..a7968cd 100644
--- a/lib/ext2fs/dosio.c
+++ b/lib/ext2fs/dosio.c
@@ -278,6 +278,7 @@ static errcode_t dos_open(const char *dev, int flags, io_channel *channel)
if(!HW_OK())
{
_dio_error = ERR_HARDWARE;
+ free(part->dev);
free(part);
return EFAULT;
}
@@ -297,6 +298,7 @@ static errcode_t dos_open(const char *dev, int flags, io_channel *channel)
if(!HW_OK())
{
_dio_error = ERR_HARDWARE;
+ free(part->dev);
free(part);
return EFAULT;
}
@@ -308,6 +310,7 @@ static errcode_t dos_open(const char *dev, int flags, io_channel *channel)
{
_dio_error = part->pno == 0xFE ? ERR_EMPTYPART :
part->pno == 0xFD ? ERR_LINUXSWAP : ERR_NOTEXT2FS;
+ free(part->dev);
free(part);
return ENODEV;
}
--
1.6.2.rc1.266.g4bdf

2009-03-09 03:15:43

by Theodore Ts'o

Subject: Re: [PATCH] * lib/ext2fs/dosio.c (dos_open): don't leak strdup'd dev name upon error

Thanks, applied.

- Ted