From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
To: linux-btrfs@vger.kernel.org
Cc: guihc.fnst@cn.fujitsu.com
Subject: [PATCH V2 1/5] btrfs-progs:free strdup()s that are not freed
Date: Thu, 5 Sep 2013 11:26:22 +0800 [thread overview]
Message-ID: <1378351582-25657-1-git-send-email-guihc.fnst@cn.fujitsu.com> (raw)
The strdup()s not freed are reported as memory leaks by valgrind.
Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
---
Changelog V1 -> V2:
- None
---
cmds-subvolume.c | 40 ++++++++++++++++++++++++++--------------
1 file changed, 26 insertions(+), 14 deletions(-)
diff --git a/cmds-subvolume.c b/cmds-subvolume.c
index e1fa81a..f7a0c5f 100644
--- a/cmds-subvolume.c
+++ b/cmds-subvolume.c
@@ -75,6 +75,8 @@ static int cmd_subvol_create(int argc, char **argv)
{
int retval, res, len;
int fddst = -1;
+ char *dupname = NULL;
+ char *dupdir = NULL;
char *newname;
char *dstdir;
char *dst;
@@ -119,10 +121,10 @@ static int cmd_subvol_create(int argc, char **argv)
goto out;
}
- newname = strdup(dst);
- newname = basename(newname);
- dstdir = strdup(dst);
- dstdir = dirname(dstdir);
+ dupname = strdup(dst);
+ newname = basename(dupname);
+ dupdir = strdup(dst);
+ dstdir = dirname(dupdir);
if (!strcmp(newname, ".") || !strcmp(newname, "..") ||
strchr(newname, '/') ){
@@ -174,6 +176,8 @@ static int cmd_subvol_create(int argc, char **argv)
out:
close_file_or_dir(fddst, dirstream);
free(inherit);
+ free(dupname);
+ free(dupdir);
return retval;
}
@@ -208,6 +212,8 @@ static int cmd_subvol_delete(int argc, char **argv)
int res, fd, len, e, cnt = 1, ret = 0;
struct btrfs_ioctl_vol_args args;
char *dname, *vname, *cpath;
+ char *dupdname = NULL;
+ char *dupvname = NULL;
char *path;
DIR *dirstream = NULL;
@@ -230,10 +236,10 @@ again:
}
cpath = realpath(path, NULL);
- dname = strdup(cpath);
- dname = dirname(dname);
- vname = strdup(cpath);
- vname = basename(vname);
+ dupdname = strdup(cpath);
+ dname = dirname(dupdname);
+ dupvname = strdup(cpath);
+ vname = basename(dupvname);
free(cpath);
if( !strcmp(vname,".") || !strcmp(vname,"..") ||
@@ -274,6 +280,8 @@ again:
}
out:
+ free(dupdname);
+ free(dupvname);
cnt++;
if (cnt < argc)
goto again;
@@ -495,6 +503,8 @@ static int cmd_snapshot(int argc, char **argv)
int res, retval;
int fd = -1, fddst = -1;
int len, readonly = 0;
+ char *dupname = NULL;
+ char *dupdir = NULL;
char *newname;
char *dstdir;
struct btrfs_ioctl_vol_args_v2 args;
@@ -562,14 +572,14 @@ static int cmd_snapshot(int argc, char **argv)
}
if (res > 0) {
- newname = strdup(subvol);
- newname = basename(newname);
+ dupname = strdup(subvol);
+ newname = basename(dupname);
dstdir = dst;
} else {
- newname = strdup(dst);
- newname = basename(newname);
- dstdir = strdup(dst);
- dstdir = dirname(dstdir);
+ dupname = strdup(dst);
+ newname = basename(dupname);
+ dupdir = strdup(dst);
+ dstdir = dirname(dupdir);
}
if (!strcmp(newname, ".") || !strcmp(newname, "..") ||
@@ -629,6 +639,8 @@ out:
close_file_or_dir(fddst, dirstream1);
close_file_or_dir(fd, dirstream2);
free(inherit);
+ free(dupname);
+ free(dupdir);
return retval;
}
--
1.8.0.1
reply other threads:[~2013-09-05 3:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1378351582-25657-1-git-send-email-guihc.fnst@cn.fujitsu.com \
--to=guihc.fnst@cn.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.