/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
sh->sh_map = (unsigned char **)
ch_malloc(order * sizeof(unsigned char *));
for (i = 0; i < order; i++) {
- sh->sh_map[i] = (unsigned char *)
- ch_malloc(size >> (1 << (order_start + i + 3)));
- memset(sh->sh_map[i], 0, size >> (1 << (order_start + i + 3)));
+ int shiftamt = order_start + 1 + i;
+ int nummaps = size >> shiftamt;
+ assert(nummaps);
+ nummaps >>= 3;
+ if (!nummaps) nummaps = 1;
+ sh->sh_map[i] = (unsigned char *) ch_malloc(nummaps);
+ memset(sh->sh_map[i], 0, nummaps);
}
sh->sh_stack = stack;
return sh;
/* ber_set_option calls us like this */
if (!ctx) return ber_memalloc_x(size, NULL);
- Debug(LDAP_DEBUG_TRACE, "==> slap_sl_malloc (%d)\n", size, 0, 0);
-
/* round up to doubleword boundary */
size += sizeof(ber_len_t) + pad;
size &= ~pad;
new = p;
/* If reallocing the last block, we can grow it */
- } else if ((char *)ptr + p[-1] == sh->sh_last) {
+ } else if ((char *)ptr + p[-1] == sh->sh_last &&
+ (char *)ptr + size < (char *)sh->sh_end ) {
new = p;
sh->sh_last = (char *)sh->sh_last + size - p[-1];
p[-1] = size;
unsigned long diff;
int i, k, inserted = 0;
- Debug( LDAP_DEBUG_TRACE, "==> slap_sl_free \n", 0, 0, 0);
-
if (!sh || ptr < sh->sh_base || ptr >= sh->sh_end) {
ber_memfree_x(ptr, NULL);
} else if (sh->sh_stack && (char *)ptr + p[-1] == sh->sh_last) {