[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.214,1.215

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

Changes by: aia21

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

Modified Files:
	attrib.c 
Log Message:
Fix long standing stupendously stupid bug in libntfs/attrib.c::
ntfs_external_attr_find() and also port a bugfix from the advanced
ntfs kernel driver to the same function.  (Anton)


Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- attrib.c	27 Mar 2006 20:01:36 -0000	1.214
+++ attrib.c	23 Jul 2006 21:43:08 -0000	1.215
@@ -2037,15 +2037,14 @@ is_enumeration:
 				ctx->ntfs_ino = ni;
 				ctx->mrec = ni->mrec;
 			}
-			ctx->attr = (ATTR_RECORD*)((char*)ctx->mrec +
-					le16_to_cpu(ctx->mrec->attrs_offset));
 		}
+		a = ctx->attr = (ATTR_RECORD*)((char*)ctx->mrec +
+				le16_to_cpu(ctx->mrec->attrs_offset));
 		/*
 		 * ctx->ntfs_ino, ctx->mrec, and ctx->attr now point to the
 		 * mft record containing the attribute represented by the
 		 * current al_entry.
-		 */
-		/*
+		 *
 		 * We could call into ntfs_attr_find() to find the right
 		 * attribute in this mft record but this would be less
 		 * efficient and not quite accurate as ntfs_attr_find() ignores
@@ -2054,9 +2053,7 @@ is_enumeration:
 		 * a proper match has been found in the attribute list entry
 		 * above, the comparison can now be optimized. So it is worth
 		 * re-implementing a simplified ntfs_attr_find() here.
-		 */
-		a = ctx->attr;
-		/*
+		 *
 		 * Use a manual loop so we can still use break and continue
 		 * with the same meanings as above.
 		 */
@@ -2065,7 +2062,7 @@ do_next_attr_loop:
 				le32_to_cpu(ctx->mrec->bytes_allocated))
 			break;
 		if (a->type == AT_END)
-			continue;
+			break;
 		if (!a->length)
 			break;
 		if (al_entry->instance != a->instance)