From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 15 Jun 2009 07:51:51 +0000 (-0400)
Subject: resize2fs: fix miscellaneous memory leaks
X-Git-Tag: v1.41.7~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2ca097fc641e9be2bbafc3db7fd96e4ac87387a;p=thirdparty%2Fe2fsprogs.git

resize2fs: fix miscellaneous memory leaks

Fix various memory leaks which were discovered using valgrind.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/resize/main.c b/resize/main.c
index 330e3ea74..9b03ba929 100644
--- a/resize/main.c
+++ b/resize/main.c
@@ -250,8 +250,10 @@ int main (int argc, char ** argv)
 				device_name);
 			exit(1);
 		}
-		if (!(mount_flags & EXT2_MF_MOUNTED) || (mtpt[len-1] == 0))
+		if (!(mount_flags & EXT2_MF_MOUNTED) || (mtpt[len-1] == 0)) {
+			free(mtpt);
 			break;
+		}
 		free(mtpt);
 		len = 2 * len;
 	}
diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 0d5dc81a4..e87a2343f 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -158,6 +158,10 @@ errcode_t resize_fs(ext2_filsys fs, blk_t *new_size, int flags,
 	ext2fs_free(rfs->old_fs);
 	if (rfs->itable_buf)
 		ext2fs_free_mem(&rfs->itable_buf);
+	if (rfs->reserve_blocks)
+		ext2fs_free_block_bitmap(rfs->reserve_blocks);
+	if (rfs->move_blocks)
+		ext2fs_free_block_bitmap(rfs->move_blocks);
 	ext2fs_free_mem(&rfs);
 
 	return 0;