From d69c30808c07f144403f508885f6f1d569f888bb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Jun 2011 11:19:23 +0300 Subject: mkfs.btrfs: fix memory leak caused by 'scandir()' calls Signed-off-by: Sergei Trofimovich Signed-off-by: Hugo Mills --- mkfs.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'mkfs.c') diff --git a/mkfs.c b/mkfs.c index 5701c0ab..b93b874e 100644 --- a/mkfs.c +++ b/mkfs.c @@ -468,6 +468,18 @@ static int directory_select(const struct direct *entry) return 1; } +static void free_namelist(struct direct **files, int count) +{ + int i; + + if (count < 0) + return; + + for (i = 0; i < count; ++i) + free(files[i]); + free(files); +} + static u64 calculate_dir_inode_size(char *dirname) { int count, i; @@ -481,6 +493,8 @@ static u64 calculate_dir_inode_size(char *dirname) dir_inode_size += strlen(cur_file->d_name); } + free_namelist(files, count); + dir_inode_size *= 2; return dir_inode_size; } @@ -971,6 +985,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, } } + free_namelist(files, count); free(parent_dir_entry->path); free(parent_dir_entry); @@ -980,6 +995,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, return 0; fail: + free_namelist(files, count); free(parent_dir_entry->path); free(parent_dir_entry); return -1; -- cgit v1.2.3