]> git.sur5r.net Git - openldap/commitdiff
Fix sl_malloc valgrind support.
authorHallvard Furuseth <hallvard@openldap.org>
Mon, 23 Jan 2012 23:47:48 +0000 (00:47 +0100)
committerHallvard Furuseth <hallvard@openldap.org>
Tue, 24 Jan 2012 00:45:51 +0000 (01:45 +0100)
servers/slapd/sl_malloc.c

index 5c2d88d9433c920ad7e369835641383e0d56af87..fc8eb745c7a0fab0669f8b19f7b5831927bd835b 100644 (file)
@@ -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 {