From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 13 Apr 2012 14:55:20 +0000 (+0200)
Subject: 	* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): Remove
X-Git-Tag: 2.00~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee5207750f84be018436fc206d296e62617fac4e;p=thirdparty%2Fgrub.git

	* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): Remove
	redundant buggy overlap check.
---

diff --git a/ChangeLog b/ChangeLog
index 1d38f0912..37494ce54 100644
--- 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 4024902c6..a45040a8c 100644
--- 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);