[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.135,1.136

[Szakacsits S. <sz...@de...>]

Changes by: szaka

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv7129

Modified Files:
	ntfsinfo.c 
Log Message:
ntfs_dump_attr_index_allocation(): don't return if an INDX is corrupt


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- ntfsinfo.c	13 Aug 2006 18:44:46 -0000	1.135
+++ ntfsinfo.c	13 Aug 2006 18:45:57 -0000	1.136
@@ -1640,11 +1640,10 @@ static void ntfs_dump_attr_index_allocat
 			
 			entries = ntfs_dump_index_block(tmp_alloc, type,
 							ir->index_block_size);
-	       		if (entries == -1)
-				goto out_allocation;
-			
-			total_entries += entries;
-			total_indx_blocks++;
+	       		if (entries != -1) {
+				total_entries += entries;
+				total_indx_blocks++;
+			}
 		}
 		tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc + 
 						 ir->index_block_size);
@@ -1654,9 +1653,10 @@ static void ntfs_dump_attr_index_allocat
 			byte++;
 		}
 	}
+
 	printf("\tIndex entries total:\t %d\n", total_entries);
 	printf("\tINDX blocks total:\t %d\n", total_indx_blocks);
-out_allocation:
+	
 	free(allocation);
 out_bitmap:
 	free(bitmap);