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 9c2039641a9478156b1065bb3d7bcc73d5920e9f..d88b5b96943698f899c6555e8135c00d5146f183 100644 (file)
--- 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 f02fc1cb69001d1fe3669e89493ecc47962f68d0..6bb59b800367e16b02d2e19fa3d2eaba4a3694dc 100644 (file)
--- 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;