merge fixes for ITS#4419,ITS#4429

[openldap] / servers / slapd / ch_malloc.c

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 9ce0ed80ec8936c9ab3d80c701954616f59242c6..4df7720697546f05a78f98e8913fa73708cbc618 100644 (file)
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,62 +1,142 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 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
 
 #include "portable.h"
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
+
 #include <ac/string.h>
 #include <ac/socket.h>
 
 #include "slap.h"
 
-char *
+BerMemoryFunctions ch_mfuncs = {
+       (BER_MEMALLOC_FN *)ch_malloc,
+       (BER_MEMCALLOC_FN *)ch_calloc,
+       (BER_MEMREALLOC_FN *)ch_realloc,
+       (BER_MEMFREE_FN *)ch_free 
+};
+
+void *
 ch_malloc(
-    unsigned long      size
+    ber_len_t  size
 )
 {
-       char    *new;
+       void    *new;
 
-       if ( (new = (char *) malloc( size )) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "malloc of %d bytes failed\n", size, 0, 0 );
-               exit( 1 );
+       if ( (new = (void *) ber_memalloc_x( size, NULL )) == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "ch_malloc of %lu bytes failed\n",
+                       (long) size, 0, 0 );
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
 }
 
-char *
+void *
 ch_realloc(
-    char               *block,
-    unsigned long      size
+    void               *block,
+    ber_len_t  size
 )
 {
-       char    *new;
+       void    *new, *ctx;
 
        if ( block == NULL ) {
                return( ch_malloc( size ) );
        }
 
-       if ( (new = (char *) realloc( block, size )) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "realloc of %d bytes failed\n", size, 0, 0 );
-               exit( 1 );
+       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 ) {
+               Debug( LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
+                       (long) size, 0, 0 );
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
 }
 
-char *
+void *
 ch_calloc(
-    unsigned long      nelem,
-    unsigned long      size
+    ber_len_t  nelem,
+    ber_len_t  size
+)
+{
+       void    *new;
+
+       if ( (new = (void *) ber_memcalloc_x( nelem, size, NULL )) == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "ch_calloc of %lu elems of %lu bytes failed\n",
+                 (long) nelem, (long) size, 0 );
+               assert( 0 );
+               exit( EXIT_FAILURE );
+       }
+
+       return( new );
+}
+
+char *
+ch_strdup(
+    const char *string
 )
 {
        char    *new;
 
-       if ( (new = (char *) calloc( nelem, size )) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "calloc of %d elems of %d bytes failed\n",
-                 nelem, size, 0 );
-               exit( 1 );
+       if ( (new = ber_strdup_x( string, NULL )) == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
 }
+
+void
+ch_free( void *ptr )
+{
+       void *ctx;
+
+       ctx = slap_sl_context( ptr );
+       if (ctx) {
+               slap_sl_free( ptr, ctx );
+       } else {
+               ber_memfree_x( ptr, NULL );
+       }
+}
+