From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 29 Feb 2012 13:57:59 +0000 (+0100)
Subject: 	* grub-core/disk/diskfilter.c (read_segment): Initialise err
X-Git-Tag: 2.00~481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32eb6ee1570a3a18a7e7ccdb323b325bf911d6cb;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index 7402b9e7c..84aef90f2 100644
--- 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 14f7c0340..eff588f4b 100644
--- 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