X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fch_malloc.c;h=56b0eb0b36d1b876bc6ccba44df5d85e60c8c8af;hb=294da7ed11a9a5721b15d0ed81682f123e20cbb0;hp=2c7f850520d6ce03f8406d94680e1d75f3bee38f;hpb=e2ee741ea86edb97a08b3f217760f1cd5972302e;p=openldap
diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 2c7f850520..56b0eb0b36 100644
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,25 +1,61 @@
/* ch_malloc.c - malloc routines that test returns from malloc and friends */
+/* $OpenLDAP$ */
+/* 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
#include "portable.h"
#include
-#include
+
+#include
#include
#include
#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(
- unsigned long size
+ ber_len_t size
)
{
void *new;
- if ( (new = (void *) malloc( size )) == NULL ) {
- Debug( LDAP_DEBUG_ANY, "malloc of %lu 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 );
@@ -28,18 +64,30 @@ ch_malloc(
void *
ch_realloc(
void *block,
- unsigned long size
+ ber_len_t size
)
{
- void *new;
+ void *new, *ctx;
if ( block == NULL ) {
return( ch_malloc( size ) );
}
- if ( (new = (void *) realloc( block, size )) == NULL ) {
- Debug( LDAP_DEBUG_ANY, "realloc of %lu 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 );
@@ -47,16 +95,17 @@ ch_realloc(
void *
ch_calloc(
- unsigned long nelem,
- unsigned long size
+ ber_len_t nelem,
+ ber_len_t size
)
{
void *new;
- if ( (new = (void *) calloc( nelem, size )) == NULL ) {
- Debug( LDAP_DEBUG_ANY, "calloc of %lu elems of %lu bytes failed\n",
- nelem, size, 0 );
- exit( 1 );
+ 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 );
@@ -69,11 +118,25 @@ ch_strdup(
{
char *new;
- if ( (new = strdup( string )) == NULL ) {
- Debug( LDAP_DEBUG_ANY, "strdup(%s) failed\n", string, 0, 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 );
+ }
+}
+