[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.108,1.109

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

Changes by: szaka

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

Modified Files:
	ntfsinfo.c 
Log Message:
ntfs_attr_readall(): fix ntfs_attr leaks in error cases


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- ntfsinfo.c	26 Mar 2006 18:14:33 -0000	1.108
+++ ntfsinfo.c	27 Mar 2006 19:33:20 -0000	1.109
@@ -1074,7 +1074,7 @@ static void *ntfs_attr_readall(ntfs_inod
 			       ntfschar *name, u32 name_len, s64 *data_size)
 {
 	ntfs_attr *na;
-	void *data;
+	void *data, *ret = NULL;
 	s64 size;
 	
 	na = ntfs_attr_open(ni, type, name, name_len);
@@ -1085,18 +1085,20 @@ static void *ntfs_attr_readall(ntfs_inod
 	data = malloc(na->data_size);
 	if (!data) {
 		ntfs_log_perror("malloc failed");
-		return NULL;
+		goto out;
 	}
 	size = ntfs_attr_pread(na, 0, na->data_size, data);
 	if (size != na->data_size) {
 		ntfs_log_perror("ntfs_attr_pread failed");
 		free(data);
-		return NULL;
+		goto out;
 	}
-	ntfs_attr_close(na);
+	ret = data;
 	if (data_size)
 		*data_size = size;
-	return data;
+out:
+	ntfs_attr_close(na);
+	return ret;
 }
 
 static void ntfs_dump_sds(ATTR_RECORD *attr, ntfs_inode *ni)