* grub-core/partmap/msdos.c (pc_partition_map_embed): Revert

incorrect off-by-one fix from 2011-02-12.  A 62-sector core image
should fit before end == 63.

diff --git a/ChangeLog b/ChangeLog
index 1ab401d6ec01d351e42dc8506a0bf992bfaaf9cb..5db804e2ad92334eeea7d53e6a59d511be144e4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-19  Colin Watson  <cjwatson@ubuntu.com>
+
+       * grub-core/partmap/msdos.c (pc_partition_map_embed): Revert
+       incorrect off-by-one fix from 2011-02-12.  A 62-sector core image
+       should fit before end == 63.
+
 2012-09-19  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub-setup.c (write_rootdev): Remove unused core_img

diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
index 6e54a7427176bb00ac997d9ac17eed4ad339f453..10ca3f08b1b7d058427d45ccc3519a281c1358aa 100644 (file)
--- a/grub-core/partmap/msdos.c
+++ b/grub-core/partmap/msdos.c
@@ -316,14 +316,14 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
        break;
     }
 
-  if (end >= *nsectors + 2)
+  if (end >= *nsectors + 1)
     {
       unsigned i, j;
       char *embed_signature_check;
       unsigned int orig_nsectors, avail_nsectors;
 
       orig_nsectors = *nsectors;
-      *nsectors = end - 2;
+      *nsectors = end - 1;
       avail_nsectors = *nsectors;
       if (*nsectors > max_nsectors)
        *nsectors = max_nsectors;