From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
To: linux-btrfs@vger.kernel.org
Cc: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Subject: [PATCH 4/5] btrfs-progs:free the local list pending_list in btrfs_scan_one_dir
Date: Thu, 5 Sep 2013 10:38:57 +0800 [thread overview]
Message-ID: <1378348738-14451-5-git-send-email-guihc.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1378348738-14451-1-git-send-email-guihc.fnst@cn.fujitsu.com>
Originally the local pending_list is not guaranteed to be freed upon fails, it should be emptyed and the elements should be freed.
Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
---
utils.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/utils.c b/utils.c
index d022d58..134bf80 100644
--- a/utils.c
+++ b/utils.c
@@ -1066,8 +1066,8 @@ again:
dirp = opendir(dirname);
if (!dirp) {
fprintf(stderr, "Unable to open %s for scanning\n", dirname);
- free(fullpath);
- return -ENOENT;
+ ret = -ENOENT;
+ goto fail;
}
while(1) {
dirent = readdir(dirp);
@@ -1133,6 +1133,12 @@ again:
fail:
free(pending);
free(fullpath);
+ while (!list_empty(&pending_list)) {
+ pending = list_entry(pending_list.next, struct pending_dir,
+ list);
+ list_del(&pending->list);
+ free(pending);
+ }
if (dirp)
closedir(dirp);
return ret;
--
1.8.0.1
next prev parent reply other threads:[~2013-09-05 2:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-05 2:38 [PATCH 0/5] Memory leaks amended Gui Hecheng
2013-09-05 2:38 ` [PATCH 1/5] btrfs-progs:free local variable buf upon unsuccessful returns Gui Hecheng
2013-09-05 2:38 ` [PATCH 2/5] btrfs-progs:local variable memory freed Gui Hecheng
2013-09-09 14:18 ` David Sterba
2013-09-09 14:22 ` David Sterba
2013-09-05 2:38 ` [PATCH 3/5] btrfs-progs: missing tree-freeing statements added Gui Hecheng
2013-09-05 2:38 ` Gui Hecheng [this message]
2013-09-05 2:38 ` [PATCH 5/5] btrfs-progs:free strdup()s that are not freed Gui Hecheng
2013-09-05 7:00 ` Stefan Behrens
2013-09-05 7:10 ` Stefan Behrens
2013-09-05 8:08 ` Gui Hecheng
2013-09-05 8:10 ` Wang Shilong
2013-09-09 14:40 ` David Sterba
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=1378348738-14451-5-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).