From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sat, 2 Jan 2010 21:05:11 +0000 (+0000)
Subject: ITS#6437: Fix alignment after slap_sl_realloc().
X-Git-Tag: MIGRATION_CVS2GIT~728
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5b164ba74cfff43f175f11cbb19f0ad54df30f27;p=openldap

ITS#6437: Fix alignment after slap_sl_realloc().
Also use -Align instead of ~pad: Valid also for non-twos complement.
---

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index 2309f13946..6e2db09b69 100644
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -129,8 +129,7 @@ slap_sl_mem_create(
 		return sh;
 
 	/* round up to doubleword boundary */
-	size += pad;
-	size &= ~pad;
+	size = (size + Align-1) & -Align;
 
 	if (!sh) {
 			sh = ch_malloc(sizeof(struct slab_heap));
@@ -243,8 +242,7 @@ slap_sl_malloc(
 	}
 
 	/* round up to doubleword boundary, plus space for len at head and tail */
-	size += 2*sizeof(ber_len_t) + pad;
-	size &= ~pad;
+	size = (size + 2*sizeof(ber_len_t) + Align-1) & -Align;
 
 	if (sh->sh_stack) {
 		if ((char *)sh->sh_last + size >= (char *)sh->sh_end) {
@@ -370,9 +368,8 @@ slap_sl_realloc(void *ptr, ber_len_t size, void *ctx)
 	}
 
 	if (sh->sh_stack) {
-		/* round up to doubleword boundary */
-		size += pad + sizeof( ber_len_t );
-		size &= ~pad;
+		/* Round up to doubleword boundary, add room for head */
+		size = ((size + Align-1) & -Align) + sizeof( ber_len_t );
 
 		p--;