From: Eryu Guan <guaneryu@gmail.com>
Date: Mon, 19 Oct 2015 11:37:59 +0000 (+0800)
Subject: btrfs-progs: fix memory leak in cmd_qgroup_show()
X-Git-Tag: upstream/4.16.1~1953
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1669d8afa647c63a8a28669b9eadfb64ce98f3d7;p=platform%2Fupstream%2Fbtrfs-progs.git

btrfs-progs: fix memory leak in cmd_qgroup_show()

filter_set and comparer_set should be freed on return.

Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/cmds-qgroup.c b/cmds-qgroup.c
index 0ad99f4..a64b716 100644
--- a/cmds-qgroup.c
+++ b/cmds-qgroup.c
@@ -348,8 +348,11 @@ static int cmd_qgroup_show(int argc, char **argv)
 
 	path = argv[optind];
 	fd = btrfs_open_dir(path, &dirstream, 1);
-	if (fd < 0)
+	if (fd < 0) {
+		btrfs_qgroup_free_filter_set(filter_set);
+		btrfs_qgroup_free_comparer_set(comparer_set);
 		return 1;
+	}
 
 	if (filter_flag) {
 		qgroupid = btrfs_get_path_rootid(fd);
diff --git a/qgroup.c b/qgroup.c
index 99fddea..1fbfcb9 100644
--- a/qgroup.c
+++ b/qgroup.c
@@ -1208,6 +1208,7 @@ int btrfs_show_qgroups(int fd,
 
 	__free_all_qgroups(&qgroup_lookup);
 	btrfs_qgroup_free_filter_set(filter_set);
+	btrfs_qgroup_free_comparer_set(comp_set);
 	return ret;
 }