always pass a DN to the underlying database (ITS#6070)

[openldap] / servers / slapd / sl_malloc.c

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index 4feab16e2b2438f02943fe1a892db05ece729aa9..998d50bd8a9378a6af8b35eaf6db38bb5bc4282f 100644 (file)
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2007 The OpenLDAP Foundation.
+ * Copyright 2003-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -129,7 +129,7 @@ slap_sl_mem_create(
                        slheap = sh;
 #else
                        ldap_pvt_thread_pool_setkey(ctx, (void *)slap_sl_mem_init,
-                               (void *)sh, slap_sl_mem_destroy);
+                               (void *)sh, slap_sl_mem_destroy, NULL, NULL);
 #endif
                } else if ( size > (char *)sh->sh_end - (char *)sh->sh_base ) {
                        void    *newptr;
@@ -162,7 +162,7 @@ slap_sl_mem_create(
                        slheap = sh;
 #else
                        ldap_pvt_thread_pool_setkey(ctx, (void *)slap_sl_mem_init,
-                               (void *)sh, slap_sl_mem_destroy);
+                               (void *)sh, slap_sl_mem_destroy, NULL, NULL);
 #endif
                } else {
                        for (i = 0; i <= sh->sh_maxorder - order_start; i++) {
@@ -195,7 +195,7 @@ slap_sl_mem_create(
                        if (size > (char *)sh->sh_end - (char *)sh->sh_base) {
                                void    *newptr;
 
-                               newptr = realloc( sh->sh_base, size );
+                               newptr = ch_realloc( sh->sh_base, size );
                                if ( newptr == NULL ) return NULL;
                                sh->sh_base = newptr;
                        }
@@ -246,7 +246,8 @@ slap_sl_mem_detach(
        slheap = NULL;
 #else
        /* separate from context */
-       ldap_pvt_thread_pool_setkey( ctx, (void *)slap_sl_mem_init, NULL, NULL );
+       ldap_pvt_thread_pool_setkey( ctx, (void *)slap_sl_mem_init,
+               NULL, 0, NULL, NULL );
 #endif
 }
 
@@ -266,11 +267,19 @@ slap_sl_malloc(
        int i, j;
 
 #ifdef SLAP_NO_SL_MALLOC
-       return ber_memalloc_x( size, NULL );
+       newptr = ber_memalloc_x( size, NULL );
+       if ( newptr ) return newptr;
+       assert( 0 );
+       exit( EXIT_FAILURE );
 #endif
 
        /* ber_set_option calls us like this */
-       if (!ctx) return ber_memalloc_x(size, NULL);
+       if (!ctx) {
+               newptr = ber_memalloc_x( size, NULL );
+               if ( newptr ) return newptr;
+               assert( 0 );
+               exit( EXIT_FAILURE );
+       }
 
        /* round up to doubleword boundary */
        size += sizeof(ber_len_t) + pad;
@@ -374,7 +383,10 @@ slap_sl_realloc(void *ptr, ber_len_t size, void *ctx)
                return slap_sl_malloc(size, ctx);
 
 #ifdef SLAP_NO_SL_MALLOC
-       return ber_memrealloc_x( ptr, size, NULL );
+       newptr = ber_memrealloc_x( ptr, size, NULL );
+       if ( newptr ) return newptr;
+       assert( 0 );
+       exit( EXIT_FAILURE );
 #endif
 
        /* Not our memory? */