* grub-core/partmap/amiga.c (GRUB_AMIGA_RDSK_MAGIC): New define.

	(amiga_partition_map_iterate): Use grub_memcmp instead of grub_strcmp.
	Reported by:EHeM.

diff --git a/ChangeLog b/ChangeLog
index dae48b0e6d762476209a8c96e11741741c8f6ac3..c9339e164e58f4a67d1ed0d9ac73e4e48edbe040 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/partmap/amiga.c (GRUB_AMIGA_RDSK_MAGIC): New define.
+       (amiga_partition_map_iterate): Use grub_memcmp instead of grub_strcmp.
+       Reported by:EHeM.
+
 2010-12-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/i386/bsdXX.c (grub_openbsd_find_ramdisk): Silence

diff --git a/grub-core/partmap/amiga.c b/grub-core/partmap/amiga.c
index f21c5b2431feff89d083a2c26d5cd2e9ded71592..a3ea3499c3c943406641dfd77d872318086f20c2 100644 (file)
--- a/grub-core/partmap/amiga.c
+++ b/grub-core/partmap/amiga.c
@@ -27,6 +27,7 @@ struct grub_amiga_rdsk
 {
   /* "RDSK".  */
   grub_uint8_t magic[4];
+#define GRUB_AMIGA_RDSK_MAGIC "RDSK"
   grub_uint32_t size;
   grub_int32_t checksum;
   grub_uint32_t scsihost;
@@ -87,7 +88,8 @@ amiga_partition_map_iterate (grub_disk_t disk,
       if (grub_disk_read (disk, pos, 0, sizeof (rdsk), &rdsk))
        return grub_errno;
 
-      if (grub_strcmp ((char *) rdsk.magic, "RDSK") == 0)
+      if (grub_memcmp (rdsk.magic, GRUB_AMIGA_RDSK_MAGIC,
+                      sizeof (rdsk.magic)) == 0)
        {
          /* Found the first PART block.  */
          next = grub_be_to_cpu32 (rdsk.partitionlst);