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

mallocalign: make sure alignptr offset is modulo align when -offset > align

Browse source
This commit is contained in:
cinap_lenrek 2014-02-02 05:47:13 +01:00
parent e289fd8ccd
commit a6fd3cc8e3
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/src/libc/port/pool.c
View file

@ -1042,11 +1042,12 @@ alignptr(void *v, ulong align, long offset)
c = v; c = v;
if(align){ if(align){
off = (uintptr)c%align; off = ((ulong)(uintptr)c) % align;
if(off != offset){ if(off != offset){
c += offset - off; offset -= off;
if(off > offset) if(offset < 0)
c += align; offset += align;
c += offset;
} }
} }
return c; return c;
@ -1080,7 +1081,6 @@ poolallocalignl(Pool *p, ulong dsize, ulong align, long offset, ulong span)
if(align){ if(align){
if(offset < 0) if(offset < 0)
offset = align - ((-offset)%align); offset = align - ((-offset)%align);
else
offset %= align; offset %= align;
} }
asize = dsize+align; asize = dsize+align;