Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / ch_malloc.c

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 8084b7e2d0a0d8ed971588bb1412f4a3e2ac5414..22b41c46b6a1b8dc8fd14cf66e82662a7acb80bb 100644 (file)
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,8 +1,27 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2014 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #define CH_FREE 1
@@ -33,13 +52,8 @@ ch_malloc(
        void    *new;
 
        if ( (new = (void *) ber_memalloc_x( size, NULL )) == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                          "ch_malloc: allocation of %lu bytes failed\n", (long)size, 0,0 );
-#else
                Debug( LDAP_DEBUG_ANY, "ch_malloc of %lu bytes failed\n",
                        (long) size, 0, 0 );
-#endif
                assert( 0 );
                exit( EXIT_FAILURE );
        }
@@ -53,7 +67,7 @@ ch_realloc(
     ber_len_t  size
 )
 {
-       void    *new;
+       void    *new, *ctx;
 
        if ( block == NULL ) {
                return( ch_malloc( size ) );
@@ -61,16 +75,17 @@ ch_realloc(
 
        if( size == 0 ) {
                ch_free( block );
+               return NULL;
+       }
+
+       ctx = slap_sl_context( block );
+       if ( ctx ) {
+               return slap_sl_realloc( block, size, ctx );
        }
 
        if ( (new = (void *) ber_memrealloc_x( block, size, NULL )) == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                          "ch_realloc: reallocation of %lu bytes failed\n", (long)size, 0,0 );
-#else
                Debug( LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
                        (long) size, 0, 0 );
-#endif
                assert( 0 );
                exit( EXIT_FAILURE );
        }
@@ -87,14 +102,8 @@ ch_calloc(
        void    *new;
 
        if ( (new = (void *) ber_memcalloc_x( nelem, size, NULL )) == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                          "ch_calloc: allocation of %lu elements of %lu bytes faild\n",
-                          (long)nelem, (long)size, 0 );
-#else
                Debug( LDAP_DEBUG_ANY, "ch_calloc of %lu elems of %lu bytes failed\n",
                  (long) nelem, (long) size, 0 );
-#endif
                assert( 0 );
                exit( EXIT_FAILURE );
        }
@@ -110,12 +119,7 @@ ch_strdup(
        char    *new;
 
        if ( (new = ber_strdup_x( string, NULL )) == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                       "chr_strdup: duplication of \"%s\" failed\n", string, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
-#endif
                assert( 0 );
                exit( EXIT_FAILURE );
        }
@@ -126,6 +130,13 @@ ch_strdup(
 void
 ch_free( void *ptr )
 {
-       ber_memfree_x( ptr, NULL );
+       void *ctx;
+
+       ctx = slap_sl_context( ptr );
+       if (ctx) {
+               slap_sl_free( ptr, ctx );
+       } else {
+               ber_memfree_x( ptr, NULL );
+       }
 }