From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LXKvI-0003I0-2o for mharc-grub-devel@gnu.org; Wed, 11 Feb 2009 14:39:04 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LXKvF-0003F2-Ej for grub-devel@gnu.org; Wed, 11 Feb 2009 14:39:01 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LXKvE-0003Dc-Fg for grub-devel@gnu.org; Wed, 11 Feb 2009 14:39:00 -0500 Received: from [199.232.76.173] (port=36680 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LXKvE-0003DO-BZ for grub-devel@gnu.org; Wed, 11 Feb 2009 14:39:00 -0500 Received: from mx1.wp.pl ([212.77.101.5]:15406) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LXKvD-000380-UP for grub-devel@gnu.org; Wed, 11 Feb 2009 14:39:00 -0500 Received: (wp-smtpd smtp.wp.pl 24522 invoked from network); 11 Feb 2009 20:38:47 +0100 Received: from 77-253-87-240.adsl.inetia.pl (HELO [192.168.1.2]) (deadwood@[77.253.87.240]) (envelope-sender ) by smtp.wp.pl (WP-SMTPD) with AES256-SHA encrypted SMTP for ; 11 Feb 2009 20:38:47 +0100 Message-ID: <4993297F.6020705@wp.pl> Date: Wed, 11 Feb 2009 20:39:43 +0100 From: Krzysztof Smiechowicz User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: The development of GRUB 2 References: <492863A7.7090902@wp.pl> <20081128201408.GG7980@thorin> <4963988E.1010304@wp.pl> In-Reply-To: <4963988E.1010304@wp.pl> Content-Type: multipart/mixed; boundary="------------040508060609080203070607" X-WP-AV: skaner antywirusowy poczty Wirtualnej Polski S. A. X-WP-SPAM: NO 0000005 [geeW] X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (1203?) Subject: Re: [PATCH] Corrections to affs and sfs X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Feb 2009 19:39:01 -0000 This is a multi-part message in MIME format. --------------040508060609080203070607 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit > Hello, > > Any news about applying this patch? :) > Hello, I'm resubmitting the updated patch. Changelog: 2009-02-11 Krzysztof Smiechowicz * fs/sfs.c (grub_sfs_read_extent) : Correction to traversing extent b-tree --------------040508060609080203070607 Content-Type: text/x-diff; name="sfs.c.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="sfs.c.diff" Index: fs/sfs.c =================================================================== --- fs/sfs.c (wersja 1940) +++ fs/sfs.c (kopia robocza) @@ -172,7 +172,7 @@ return grub_errno; } - for (i = 0; i < grub_be_to_cpu16 (tree->nodes); i++) + for (i = grub_be_to_cpu16(tree->nodes) - 1; i >= 0; i--) { #define EXTNODE(tree, index) \ @@ -180,17 +180,9 @@ + (index) * (tree)->nodesize)) /* Follow the tree down to the leaf level. */ - if ((grub_be_to_cpu32 (EXTNODE(tree, i)->key) >= block) + if ((grub_be_to_cpu32 (EXTNODE(tree, i)->key) <= block) && !tree->leaf) { - next = grub_be_to_cpu32 (EXTNODE (tree, i - 1)->data); - break; - } - - /* In case the last node is reached just use that one, it is - the right match. */ - if (i + 1 == grub_be_to_cpu16 (tree->nodes) && !tree->leaf) - { next = grub_be_to_cpu32 (EXTNODE (tree, i)->data); break; } --------------040508060609080203070607--