[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.146,1.147

[Anton A. <ai...@de...>]

Changes by: aia21

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

Modified Files:
	ntfsinfo.c 
Log Message:
Make ntfsinfo more resilient to corrupt metadata.  Otherwise it can cause an
infinite loop...


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- ntfsinfo.c	14 Aug 2006 03:52:09 -0000	1.146
+++ ntfsinfo.c	16 Aug 2006 08:14:22 -0000	1.147
@@ -1443,6 +1443,10 @@ static int ntfs_dump_index_entries(INDEX
 			ntfs_dump_index_data(entry, type);
 			break;
 		}
+		if (!entry->length) {
+			ntfs_log_verbose("\tWARNING: Corrupt index entry, skipping this index block.\n");
+			break;
+		}
 		entry = (INDEX_ENTRY *)((u8 *)entry +
 						le16_to_cpu(entry->length));
 		numb_entries++;