2009-07-31 Pavel Roskin <proski@gnu.org>

	* disk/raid5_recover.c (grub_raid5_recover): Revert conversion
	to grub_zalloc(), it was erroneous.
	Reported by Bean <bean123ch@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 5183b55e0abc0e32b8c1905effe39da47b094c7e..0ac713c7c87de0a1e0386237db6c75919023f858 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-31  Pavel Roskin  <proski@gnu.org>
+
+       * disk/raid5_recover.c (grub_raid5_recover): Revert conversion
+       to grub_zalloc(), it was erroneous.
+       Reported by Bean <bean123ch@gmail.com>
+
 2009-07-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/i386/pc/grub-setup.c (setup): Check that no partition is in

diff --git a/disk/raid5_recover.c b/disk/raid5_recover.c
index a280be1ac7fab91f5d9ef08bd8dca3e9e0563350..31cef88b13f6f2a15c6b8a9a11d2dea36dab2233 100644 (file)
--- a/disk/raid5_recover.c
+++ b/disk/raid5_recover.c
@@ -32,10 +32,12 @@ grub_raid5_recover (struct grub_raid_array *array, int disknr,
   int i;
 
   size <<= GRUB_DISK_SECTOR_BITS;
-  buf2 = grub_zalloc (size);
+  buf2 = grub_malloc (size);
   if (!buf2)
     return grub_errno;
 
+  grub_memset (buf, 0, size);
+
   for (i = 0; i < (int) array->total_devs; i++)
     {
       grub_err_t err;