btrfs-progs: free the local list pending_list in btrfs_scan_one_dir
authorGui Hecheng <guihc.fnst@cn.fujitsu.com>
Thu, 5 Sep 2013 02:38:57 +0000 (10:38 +0800)
committerChris Mason <chris.mason@fusionio.com>
Wed, 16 Oct 2013 12:20:42 +0000 (08:20 -0400)
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>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
utils.c

diff --git a/utils.c b/utils.c
index d022d58..134bf80 100644 (file)
--- 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;