marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mkfs.btrfs: fix memory leak caused by 'scandir()' calls 

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Signed-off-by: Hugo Mills <hugo@carfax.org.uk>
master
Sergei Trofimovich 2011-06-04 11:19:23 +03:00 committed by Chris Mason
parent e06947319c
commit d69c30808c
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mkfs.c
View File

@ -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;