* grub-core/disk/diskfilter.c (read_segment): Initialise err

	before loops.

diff --git a/ChangeLog b/ChangeLog
index 7402b9e7c2f361af6568b37fbc2183a51ea21cb3..84aef90f2c1a91577ce2726329af42699a17a0d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/diskfilter.c (read_segment): Initialise err
+       before loops.
+
 2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/lib/xzembed/xz_dec_stream.c (hash_validate): Use void *

diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
index 14f7c03402550abeb7a69080855c6231021f0d6c..eff588f4b62166b99ccc39a2c84c5feec1576afb 100644 (file)
--- a/grub-core/disk/diskfilter.c
+++ b/grub-core/disk/diskfilter.c
@@ -457,11 +457,13 @@ read_segment (struct grub_diskfilter_segment *seg, grub_disk_addr_t sector,
            if (read_size > size)
              read_size = size;
 
+           err = 0;
            for (i = 0; i < near; i++)
              {
                unsigned int k;
 
                k = disknr;
+               err = 0;
                for (j = 0; j < far; j++)
                  {
                    if (grub_errno == GRUB_ERR_READ_ERROR