From 708367a39faf73c180d12542ead4a969b3103d15 Mon Sep 17 00:00:00 2001 From: okuji Date: Wed, 19 Oct 2005 23:16:03 +0000 Subject: [PATCH] 2005-10-20 Timothy Baldwin * io/gzio.c (grub_gzio_read): Use OFFSET instead of FILE->OFFSET consistently within the loop. --- ChangeLog | 5 +++++ io/gzio.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9c2039641..d88b5b969 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-20 Timothy Baldwin + + * io/gzio.c (grub_gzio_read): Use OFFSET instead of FILE->OFFSET + consistently within the loop. + 2005-10-15 Marco Gerards * 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;