shithub: riscv

Info  •  Files  •  Log  •  Branches

correct check for segment overlap (rmiller)

--- a/sys/src/9/port/segment.c

+++ b/sys/src/9/port/segment.c

@@ -427,7 +427,7 @@

 		ns = up->seg[i];

 		if(ns == nil || ns == s)

 			continue;

-		if(newtop >= ns->base && newtop < ns->top) {

+		if(newtop > ns->base && s->base < ns->top) {

 			qunlock(s);

 			error(Esoverlap);

 		}

@@ -544,8 +544,7 @@

 		ns = up->seg[i];

 		if(ns == nil)

 			continue;

-		if((newtop > ns->base && newtop <= ns->top) ||

-		   (va >= ns->base && va < ns->top))

+		if(newtop > ns->base && va < ns->top)

 			return ns;

 	}

 	return nil;