From 057d6ea34cf350d13be50fde9b024a9dacf548fe Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Thu, 15 Nov 2012 13:47:50 +0900 Subject: [PATCH] btrfs-progs: plug a memory leak reported by cppcheck [src/btrfs/disk-io.c:462]: (error) Memory leak: log_root Signed-off-by: Kenji Okimoto --- disk-io.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/disk-io.c b/disk-io.c index 0395205..32f45dc 100644 --- a/disk-io.c +++ b/disk-io.c @@ -458,8 +458,10 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root, u64 blocknr = btrfs_super_log_root(disk_super); struct btrfs_root *log_root = malloc(sizeof(struct btrfs_root)); - if (blocknr == 0) + if (blocknr == 0) { + free(log_root); return 0; + } blocksize = btrfs_level_size(tree_root, btrfs_super_log_root_level(disk_super)); @@ -474,8 +476,12 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root, fs_info->log_root_tree = log_root; - if (!extent_buffer_uptodate(log_root->node)) + if (!extent_buffer_uptodate(log_root->node)) { + free(log_root); return -EIO; + } + + free(log_root); return 0; } -- 2.7.4