X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fch_malloc.c;h=3e634dae51253dfc09c8c1056f9f9b7f4eddd230;hb=b73915d36f568d349061f60d27fbcc102ecf374a;hp=61bf6d4ee1244b31f61bda72c83ab36075f9e5d6;hpb=70bb39ccbc274283b5e415a6262a6304e2c6ac7a;p=openldap

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 61bf6d4ee1..3e634dae51 100644
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,8 +1,30 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 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"
 
@@ -15,6 +37,13 @@
 
 #include "slap.h"
 
+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(
     ber_len_t	size
@@ -22,7 +51,7 @@ ch_malloc(
 {
 	void	*new;
 
-	if ( (new = (void *) ber_memalloc( size )) == NULL ) {
+	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 );
@@ -38,7 +67,7 @@ ch_realloc(
     ber_len_t	size
 )
 {
-	void	*new;
+	void	*new, *ctx;
 
 	if ( block == NULL ) {
 		return( ch_malloc( size ) );
@@ -46,9 +75,15 @@ ch_realloc(
 
 	if( size == 0 ) {
 		ch_free( block );
+		return NULL;
 	}
 
-	if ( (new = (void *) ber_memrealloc( block, size )) == 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 );
@@ -66,7 +101,7 @@ ch_calloc(
 {
 	void	*new;
 
-	if ( (new = (void *) ber_memcalloc( nelem, size )) == NULL ) {
+	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 );
@@ -83,7 +118,7 @@ ch_strdup(
 {
 	char	*new;
 
-	if ( (new = ber_strdup( string )) == NULL ) {
+	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 );
@@ -95,5 +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 );
+	}
 }
+