[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.84,1.85

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
rl_expand(): check if new length isn't already more than requested


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- ntfsresize.c	1 Aug 2005 22:10:41 -0000	1.84
+++ ntfsresize.c	3 Aug 2005 21:35:22 -0000	1.85
@@ -1809,7 +1809,11 @@ static void rl_expand(runlist **rl, cons
 
 	len = rl_items(p);
 	if (len <= 1)
-		err_exit("ntfs_rl_expand: bad runlist length: %d\n", len);
+		err_exit("rl_expand: bad runlist length: %d\n", len);
+
+	if (p[len - 1].vcn > last_vcn)
+		err_exit("rl_expand: length is already more than requested "
+			 "(%lld > %lld)\n", p[len - 1].vcn, last_vcn);
 
 	if (p[len - 2].lcn == LCN_HOLE) {
 
@@ -1820,7 +1824,7 @@ static void rl_expand(runlist **rl, cons
 
 		p = realloc(*rl, ++len * sizeof(runlist_element));
 		if (!p)
-			perr_exit("ntfs_rl_expand: realloc");
+			perr_exit("rl_expand: realloc");
 
 		p[len - 2].lcn = LCN_HOLE;
 		p[len - 2].length = last_vcn - p[len - 2].vcn;
@@ -1828,7 +1832,7 @@ static void rl_expand(runlist **rl, cons
 		*rl = p;
 
 	} else
-		err_exit("ntfs_rl_expand: bad LCN: %lld\n", p[len - 2].lcn);
+		err_exit("rl_expand: bad LCN: %lld\n", p[len - 2].lcn);
 }
 
 /**