shithub: riscv

Info  •  Files  •  Log  •  Branches

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

--- a/sys/src/libc/port/pool.c

+++ b/sys/src/libc/port/pool.c

@@ -1042,11 +1042,12 @@

 	c = v;

 	if(align){

-		off = (uintptr)c%align;

+		off = ((ulong)(uintptr)c) % align;

 		if(off != offset){

-			c += offset - off;

-			if(off > offset)

-				c += align;

+			offset -= off;

+			if(offset < 0)

+				offset += align;

+			c += offset;

 		}

 	}

 	return c;

@@ -1080,8 +1081,7 @@

 	if(align){

 		if(offset < 0)

 			offset = align - ((-offset)%align);

-		else

-			offset %= align;

+		offset %= align;

 	}

 	asize = dsize+align;

 	v = poolallocl(p, asize);