[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.46,1.47

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30157/ntfsprogs

Modified Files:
	ntfsclone.c 
Log Message:
Fix memory leak in ignore_bad_clusters()


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- ntfsclone.c	27 Jun 2005 21:03:06 -0000	1.46
+++ ntfsclone.c	13 Jul 2005 17:07:13 -0000	1.47
@@ -1383,7 +1383,7 @@ static void ignore_bad_clusters(ntfs_wal
 {
 	ntfs_inode *ni;
 	ntfs_attr_search_ctx *ctx = NULL;
-	runlist *rl;
+	runlist *rl, *rl_bad;
 	s64 nr_bad_clusters = 0;
 
 	if (!(ni = ntfs_inode_open(vol, FILE_BadClus)))
@@ -1392,10 +1392,10 @@ static void ignore_bad_clusters(ntfs_wal
 	if ((ctx = lookup_data_attr(ni, "$Bad")) == NULL)
 		exit(1);
 
-	if (!(rl = ntfs_mapping_pairs_decompress(vol, ctx->attr, NULL)))
+	if (!(rl_bad = ntfs_mapping_pairs_decompress(vol, ctx->attr, NULL)))
 		perr_exit("ntfs_mapping_pairs_decompress");
 
-	for (; rl->length; rl++) {
+	for (rl = rl_bad; rl->length; rl++) {
 		s64 lcn = rl->lcn;
 
 		if (lcn == LCN_HOLE || lcn < 0)
@@ -1409,6 +1409,7 @@ static void ignore_bad_clusters(ntfs_wal
 	if (nr_bad_clusters)
 		Printf("WARNING: The disk has %lld or more bad sectors"
 		       " (hardware faults).\n", nr_bad_clusters);
+	free(rl_bad);
 
 	ntfs_attr_put_search_ctx(ctx);
 	if (ntfs_inode_close(ni))