xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

correct check for segment overlap (rmiller)

Browse source
This commit is contained in:
cinap_lenrek 2016-05-16 21:10:08 +02:00
parent b15430979d
commit 29c7ca80c9
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sys/src/9/port/segment.c
View file

@ -427,7 +427,7 @@ ibrk(uintptr addr, int seg)
ns = up->seg[i]; ns = up->seg[i];
if(ns == nil || ns == s) if(ns == nil || ns == s)
continue; continue;
if(newtop >= ns->base && newtop < ns->top) { if(newtop > ns->base && s->base < ns->top) {
qunlock(s); qunlock(s);
error(Esoverlap); error(Esoverlap);
} }
@ -544,8 +544,7 @@ isoverlap(uintptr va, uintptr len)
ns = up->seg[i]; ns = up->seg[i];
if(ns == nil) if(ns == nil)
continue; continue;
if((newtop > ns->base && newtop <= ns->top) || if(newtop > ns->base && va < ns->top)
(va >= ns->base && va < ns->top))
return ns; return ns;
} }
return nil; return nil;