From 3f167b6d97be62ad703b7e00e7e2f2668f265d20 Mon Sep 17 00:00:00 2001
From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 24 Jan 2012 00:47:48 +0100
Subject: [PATCH] Fix sl_malloc valgrind support.
---
servers/slapd/sl_malloc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index 5c2d88d943..fc8eb745c7 100644
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -222,7 +222,7 @@ slap_sl_mem_create(
VGMEMP_CHANGE(sh, base, newptr, size);
base = newptr;
}
- VGMEMP_TRIM(sh, sh->sh_base, 0);
+ VGMEMP_TRIM(sh, base, 0);
}
sh->sh_base = base;
sh->sh_end = base + size;
@@ -522,7 +522,8 @@ slap_sl_free(void *ptr, void *ctx)
p = (ber_len_t *) ((char *) p - p[-1]);
}
sh->sh_last = p;
- VGMEMP_TRIM(sh, sh->sh_base, sh->sh_last - sh->sh_base);
+ VGMEMP_TRIM(sh, sh->sh_base,
+ (char *) sh->sh_last - (char *) sh->sh_base);
}
} else {
--
GitLab