Change in flashrom[master]: layout: Fix overlap-check routine

[Nico Huber (Code Review)]

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

I'd like you to do a code review. Please visit

    https://review.coreboot.org/c/flashrom/+/55997

to review the following change.


Change subject: layout: Fix overlap-check routine
......................................................................

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 <[e-mail]>
---
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 https://review.coreboot.org/c/flashrom/+/55997
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I18168b9bd9a7d0fe2ba04fb091d1600f65d6dd5b
Gerrit-Change-Number: 55997
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <[e-mail]>
Gerrit-Reviewer: Anastasia Klimchuk <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Edward O'Callaghan <[e-mail]>
Gerrit-Reviewer: Thomas Heijligen <[e-mail]>
Gerrit-Attention: Thomas Heijligen <[e-mail]>
Gerrit-Attention: Edward O'Callaghan <[e-mail]>
Gerrit-Attention: Angel Pons <[e-mail]>
Gerrit-Attention: Anastasia Klimchuk <[e-mail]>
Gerrit-MessageType: newchange