From e461268d28db0a17b17b662391a39015c2718667 Mon Sep 17 00:00:00 2001
From: "cantab.net!aia21" <cantab.net!aia21>
Date: Tue, 21 Sep 2004 12:10:39 +0000
Subject: [PATCH] No need to allocate a copy of the attribute name to be passed
 to ntfs_attr_open().

(Logical change 1.576)
---
 ntfsprogs/ntfsinfo.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c
index d30a0596..1f16d2af 100644
--- a/ntfsprogs/ntfsinfo.c
+++ b/ntfsprogs/ntfsinfo.c
@@ -1178,59 +1178,40 @@ static void ntfs_dump_index_allocation(ATTR_RECORD *attr, ntfs_inode *ni)
 
 	get_type_and_size_of_indx(ni, attr, &type, &indx_record_size);
 
-	name = malloc(attr->name_length * sizeof(ntfschar));
-	if (!name) {
-		perror("malloc failed");
-		return;
-	}
-	memcpy(name, (u8 *)attr + attr->name_offset, 
-			attr->name_length * sizeof(ntfschar));
+	name = (ntfschar*)((u8*)attr + attr->name_offset);
 	na = ntfs_attr_open(ni, AT_BITMAP, name, attr->name_length);
 	if (!na) {
 		perror("ntfs_attr_open failed");
-		free(name);
 		return;
 	}
 	bitmap = malloc(na->data_size);
 	if (!bitmap) {
 		perror("malloc failed");
-		free(name);
 		return;
 	}
 	if (ntfs_attr_pread(na, 0, na->data_size, bitmap) != na->data_size) {
 		perror("ntfs_attr_pread failed");
 		free(bitmap);
-		free(name);
 		return;
 	}
 	ntfs_attr_close(na);
 	byte = bitmap;
 		
-	name = malloc(attr->name_length * sizeof(ntfschar));
-	if (!name) {
-		perror("malloc failed");
-		return;
-	}
-	memcpy(name, (u8 *)attr + attr->name_offset, 
-			attr->name_length * sizeof(ntfschar));
 	na = ntfs_attr_open(ni, AT_INDEX_ALLOCATION, name, attr->name_length);
 	if (!na) {
 		perror("ntfs_attr_open failed");
-		free(name);
 		free(bitmap);
 		return;
 	}
 	allocation = malloc(na->data_size);
 	if (!allocation) {
 		perror("malloc failed");
-		free(name);
 		free(bitmap);
 		return;
 	}
 	if (ntfs_attr_pread(na, 0, na->data_size, allocation)
 							 != na->data_size) {
 		perror("ntfs_attr_pread failed");
-		free(name);
 		free(allocation);
 		free(bitmap);
 		return;