From 32acc35698c4339844750dc55b712bb171f71416 Mon Sep 17 00:00:00 2001 From: Anton Altaparmakov Date: Thu, 23 Mar 2006 15:03:11 +0000 Subject: [PATCH] --- yaml --- r: 23336 b: refs/heads/master c: 3ccc7384db3d762e834dfdae13c1d6434b2fdeab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ntfs/ChangeLog | 2 ++ trunk/fs/ntfs/attrib.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 14f083754643..ab06a4d46240 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67b1dfe77a2eb2a88b37cd77b8979cbdb7695bd6 +refs/heads/master: 3ccc7384db3d762e834dfdae13c1d6434b2fdeab diff --git a/trunk/fs/ntfs/ChangeLog b/trunk/fs/ntfs/ChangeLog index 3d8d60be48de..d35a5c8e3da9 100644 --- a/trunk/fs/ntfs/ChangeLog +++ b/trunk/fs/ntfs/ChangeLog @@ -24,6 +24,8 @@ ToDo/Notes: - Fix two compiler warnings on Alpha. Thanks to Andrew Morton for reporting them. - Fix an (innocent) off-by-one error in the runlist code. + - Fix a buggette in an "should be impossible" case handling where we + continued the attribute lookup loop instead of aborting it. 2.1.26 - Minor bug fixes and updates. diff --git a/trunk/fs/ntfs/attrib.c b/trunk/fs/ntfs/attrib.c index 9480a0526cd3..a92b9e9db91d 100644 --- a/trunk/fs/ntfs/attrib.c +++ b/trunk/fs/ntfs/attrib.c @@ -1,7 +1,7 @@ /** * attrib.c - NTFS attribute operations. Part of the Linux-NTFS project. * - * Copyright (c) 2001-2005 Anton Altaparmakov + * Copyright (c) 2001-2006 Anton Altaparmakov * Copyright (c) 2002 Richard Russon * * This program/include file is free software; you can redistribute it and/or @@ -1048,7 +1048,7 @@ static int ntfs_external_attr_find(const ATTR_TYPE type, 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)