Attention is currently required from: Thomas Heijligen, Edward O'Callaghan, Angel Pons, Anastasia Klimchuk.

Nico Huber would like Thomas Heijligen, Edward O'Callaghan, Angel Pons and Anastasia Klimchuk to review this change.

View Change

layout: Fix overlap-check routine

Fixes a regression introduced by commit 06a89d713 (layout: Introduce
layout_next()). A negation was dropped by accident which resulted in
comparisons with later, not-included regions instead of included ones.

Change-Id: I18168b9bd9a7d0fe2ba04fb091d1600f65d6dd5b
Signed-off-by: Nico Huber <nico.huber@secunet.com>
---
M layout.c
1 file changed, 1 insertion(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/97/55997/1

diff --git a/layout.c b/layout.c
index e688f79..36aa247 100644
--- a/layout.c
+++ b/layout.c
@@ -257,7 +257,7 @@
 
 		const struct romentry *rhs = lhs;
 		while ((rhs = layout_next(l, rhs))) {
-			if (rhs->included)
+			if (!rhs->included)
 				continue;
 
 			if (lhs->start > rhs->end)

To view, visit change 55997. To unsubscribe, or for help writing mail filters, visit settings.