From: robertmh <robertmh@localhost>
Date: Sun, 23 Dec 2007 21:28:03 +0000 (+0000)
Subject: 2007-12-23  Robert Millan  <rmh@aybabtu.com>
X-Git-Tag: 1.98~1747
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57e57e3167c82e392e2b98e0648ec7f7a1cf96cb;p=thirdparty%2Fgrub.git

2007-12-23  Robert Millan  <rmh@aybabtu.com>

	Patch from Bean  <bean123ch@gmail.com>:
	* disk/loopback.c (grub_loopback_read): Add missing bit shift to
	`size'.
---

diff --git a/ChangeLog b/ChangeLog
index 7d365b7c2..538a9d5bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-23  Robert Millan  <rmh@aybabtu.com>
+
+	Patch from Bean  <bean123ch@gmail.com>:
+	* disk/loopback.c (grub_loopback_read): Add missing bit shift to
+	`size'.
+
 2007-12-21  Bean  <bean123ch@gmail.com>
 
 	* conf/common.rmk (pkgdata_MODULES): Add ntfscomp.mod.
diff --git a/disk/loopback.c b/disk/loopback.c
index 9d48def19..31d811688 100644
--- a/disk/loopback.c
+++ b/disk/loopback.c
@@ -214,7 +214,7 @@ grub_loopback_read (grub_disk_t disk, grub_disk_addr_t sector,
   if (pos > file->size)
     {
       grub_size_t amount = pos - file->size;
-      grub_memset (buf + size - amount, 0, amount);
+      grub_memset (buf + (size << GRUB_DISK_SECTOR_BITS) - amount, 0, amount);
     }
   
   return 0;