From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 14 Mar 2011 22:01:32 +0000 (+0000)
Subject: merge trunk
X-Git-Tag: 2.00~508^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bdeb3987a52fcfd3b6eaaca3240b3f7002f07a7;p=thirdparty%2Fgrub.git

merge trunk
---

7bdeb3987a52fcfd3b6eaaca3240b3f7002f07a7
diff --cc grub-core/partmap/msdos.c
index c6340a231,31a0a0707..acfa6f302
--- a/grub-core/partmap/msdos.c
+++ b/grub-core/partmap/msdos.c
@@@ -271,14 -232,10 +271,14 @@@ pc_partition_map_embed (struct grub_dis
  	break;
      }
  
-   if (end >= *nsectors + 1)
+   if (end >= *nsectors + 2)
      {
-       int i, j;
 -      unsigned i;
++      unsigned i, j;
 +      char *embed_signature_check;
 +      unsigned int orig_nsectors;
 +
 +      orig_nsectors = *nsectors;
-       *nsectors = end - 1;
+       *nsectors = end - 2;
        *sectors = grub_malloc (*nsectors * sizeof (**sectors));
        if (!*sectors)
  	return grub_errno;