commit 0a5b2a30ff134958d028e995b4e4cb9cf9021bd9
author Robert CH Chou <Robert_CH_Chou@acer.com.tw> Sat Jun 04 22:04:53 2011 +0800
committer Robert CH Chou <Robert_CH_Chou@acer.com.tw> Mon Jun 06 22:04:45 2011 +0800
tree 778a1539bb114fcadc32114e90c1f92183c8b6e8
parent 880071e1ac4d35035fa30ddd992b81360408074b

fix fd leaking and deallocation freed resource

Change-Id: Ibee4d7000bce5bc8c2e45339d4d53a242569ae4e

ext4_utils/ext4_utils.c

diff --git a/ext4_utils/ext4_utils.c b/ext4_utils/ext4_utils.c
index 60a4da3..bc5cfd0 100644
--- a/ext4_utils/ext4_utils.c
+++ b/ext4_utils/ext4_utils.c
@@ -360,6 +360,7 @@
 #elif defined(__APPLE__) && defined(__MACH__)
 	ret = ioctl(fd, DKIOCGETBLOCKCOUNT, &size);
 #else
+	close(fd);
 	return 0;
 #endif
 

ext4_utils/output_file.c

diff --git a/ext4_utils/output_file.c b/ext4_utils/output_file.c
index 3785b06..b34109a 100644
--- a/ext4_utils/output_file.c
+++ b/ext4_utils/output_file.c
@@ -279,6 +279,7 @@
 	zero_buf = malloc(info.block_size);
 	if (!zero_buf) {
 		error_errno("malloc zero_buf");
+		free(out);
 		return NULL;
 	}
 	memset(zero_buf, '\0', info.block_size);
@@ -419,10 +420,6 @@
 			goto err;
 	}
 
-	munmap(data, len);
-
-	close(file_fd);
-
 err:
 	munmap(data, len);
 	close(file_fd);