* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): Remove

	redundant buggy overlap check.

diff --git a/ChangeLog b/ChangeLog
index 1d38f091231d0cd90cd90483b49447348350f370..37494ce548e2615bc7e7fc790052662157dad49a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): Remove
+       redundant buggy overlap check.
+
 2012-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * tests/util/grub-shell.in: Set pkgdatadir when calling grub-mkrescue

diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
index 4024902c632586ba374de82e23fc668ecb3e84dd..a45040a8c7d026a2083dc202ab9e397d5953e59d 100644 (file)
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -1425,12 +1425,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
       for (chunk2 = rel->chunks; chunk2; chunk2 = chunk2->next)
        if ((chunk2->target <= chunk->target
             && chunk->target < chunk2->target + chunk2->size)
-           || (chunk2->target <= chunk->target + size
-               && chunk->target + size < chunk2->target + chunk2->size)
            || (chunk->target <= chunk2->target && chunk2->target
-               < chunk->target + size)
-           || (chunk->target <= chunk2->target + chunk2->size
-               && chunk2->target + chunk2->size < chunk->target + size))
+               < chunk->target + size))
          {
            if (preference == GRUB_RELOCATOR_PREFERENCE_HIGH)
              chunk->target = ALIGN_DOWN (chunk2->target, align);