X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fch_malloc.c;h=56b0eb0b36d1b876bc6ccba44df5d85e60c8c8af;hb=294da7ed11a9a5721b15d0ed81682f123e20cbb0;hp=999e53243051a0c892edf01249e486c70d2db008;hpb=f49fd8a98e6849f74e50a01165f4214b065b9b00;p=openldap
diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 999e532430..56b0eb0b36 100644
--- 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-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2008 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
+ * .
+ */
+/* 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
@@ -18,7 +37,12 @@
#include "slap.h"
-#ifndef CSRIMALLOC
+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(
@@ -27,15 +51,9 @@ ch_malloc(
{
void *new;
- if ( (new = (void *) ber_memalloc( size )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "ch_malloc: allocation of %lu bytes failed\n",
- (long)size ));
-#else
+ if ( (new = (void *) ber_memalloc_x( size, NULL )) == NULL ) {
Debug( LDAP_DEBUG_ANY, "ch_malloc of %lu bytes failed\n",
(long) size, 0, 0 );
-#endif
assert( 0 );
exit( EXIT_FAILURE );
}
@@ -49,7 +67,7 @@ ch_realloc(
ber_len_t size
)
{
- void *new;
+ void *new, *ctx;
if ( block == NULL ) {
return( ch_malloc( size ) );
@@ -57,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( block, size )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "ch_realloc: reallocation of %lu bytes failed\n", (long)size ));
-#else
+ 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 );
-#endif
assert( 0 );
exit( EXIT_FAILURE );
}
@@ -82,15 +101,9 @@ ch_calloc(
{
void *new;
- if ( (new = (void *) ber_memcalloc( nelem, size )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "ch_calloc: allocation of %lu elements of %lu bytes faild\n",
- (long)nelem, (long)size ));
-#else
+ 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 );
-#endif
assert( 0 );
exit( EXIT_FAILURE );
}
@@ -105,13 +118,8 @@ ch_strdup(
{
char *new;
- if ( (new = ber_strdup( string )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "chr_strdup: duplication of \"%s\" failed\n", string ));
-#else
+ if ( (new = ber_strdup_x( string, NULL )) == NULL ) {
Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
-#endif
assert( 0 );
exit( EXIT_FAILURE );
}
@@ -122,7 +130,13 @@ ch_strdup(
void
ch_free( void *ptr )
{
- ber_memfree( ptr );
+ void *ctx;
+
+ ctx = slap_sl_context( ptr );
+ if (ctx) {
+ slap_sl_free( ptr, ctx );
+ } else {
+ ber_memfree_x( ptr, NULL );
+ }
}
-#endif