From: okuji <okuji@localhost>
Date: Wed, 19 Oct 2005 23:16:03 +0000 (+0000)
Subject: 2005-10-20  Timothy Baldwin  <T.E.Baldwin99@members.leeds.ac.uk>
X-Git-Tag: 1.98~2053
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=708367a39faf73c180d12542ead4a969b3103d15;p=thirdparty%2Fgrub.git

2005-10-20  Timothy Baldwin  <T.E.Baldwin99@members.leeds.ac.uk>

        * io/gzio.c (grub_gzio_read): Use OFFSET instead of FILE->OFFSET
        consistently within the loop.
---

diff --git a/ChangeLog b/ChangeLog
index 9c2039641..d88b5b969 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-20  Timothy Baldwin  <T.E.Baldwin99@members.leeds.ac.uk>
+
+	* io/gzio.c (grub_gzio_read): Use OFFSET instead of FILE->OFFSET
+	consistently within the loop.
+
 2005-10-15  Marco Gerards  <mgerards@xs4all.nl>
 
 	* fs/xfs.c (grub_xfs_iterate_dir): Detect an error if part of a
diff --git a/io/gzio.c b/io/gzio.c
index f02fc1cb6..6bb59b800 100644
--- a/io/gzio.c
+++ b/io/gzio.c
@@ -1193,7 +1193,7 @@ grub_gzio_read (grub_file_t file, char *buf, grub_ssize_t len)
 	inflate_window (file);
 
       srcaddr = (char *) ((offset & (WSIZE - 1)) + gzio->slide);
-      size = gzio->saved_offset - file->offset;
+      size = gzio->saved_offset - offset;
       if (size > len)
 	size = len;