[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs inode.c,1.57,1.58

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

Changes by: szaka

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

Modified Files:
	inode.c 
Log Message:
ntfs_inode_close(): ElectricFence is unhappy with realloc(x,0) as free(x)
thus we distinguish these two cases


Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- inode.c	25 Jun 2005 13:15:12 -0000	1.57
+++ inode.c	27 Jun 2005 20:30:09 -0000	1.58
@@ -249,13 +249,19 @@ int ntfs_inode_close(ntfs_inode *ni)
 			memmove(tmp_nis + i, tmp_nis + i + 1,
 					(base_ni->nr_extents - i - 1) *
 					sizeof(ntfs_inode *));
-			base_ni->nr_extents--;
-			/* Resize the memory buffer. */
-			tmp_nis = realloc(tmp_nis, base_ni->nr_extents *
-					sizeof(ntfs_inode *));
-			/* Ignore realloc errors, they don't really matter. */
-			if (tmp_nis)
-				base_ni->extent_nis = tmp_nis;
+			/* 
+			 * ElectricFence is unhappy with realloc(x,0) as free(x)
+			 * thus we explicitely separate these two cases.
+			 */
+			if (--base_ni->nr_extents) {
+				/* Resize the memory buffer. */
+				tmp_nis = realloc(tmp_nis, base_ni->nr_extents *
+						  sizeof(ntfs_inode *));
+				/* Ignore errors, they don't really matter. */
+				if (tmp_nis)
+					base_ni->extent_nis = tmp_nis;
+			} else if(tmp_nis)
+				free(tmp_nis);
 			/* Allow for error checking. */
 			i = -1;
 			break;