X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fmemory.c;h=312ab796fdad850d79bbbb8eb82c56a8876bf268;hb=879d3dbc5eb5cdbc45c12afca1bada8207039246;hp=ee5f4e8edea2fb967d8a312d92b7f18d254c0817;hpb=2f969f855218b4457289d4ff9ec47984563f0366;p=openldap

diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c
index ee5f4e8ede..312ab796fd 100644
--- a/libraries/liblber/memory.c
+++ b/libraries/liblber/memory.c
@@ -4,49 +4,316 @@
  */
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
+#include <ac/string.h>
+
+#undef LDAP_F_PRE
+#define LDAP_F_PRE LDAP_F_EXPORT
 
 #include "lber-int.h"
 
+#if LDAP_MEMORY_DEBUG
+struct ber_mem_hdr {
+	union bmu_align_u {
+		ber_len_t	bmu_len_t;
+		ber_tag_t	bmu_tag_t;
+		ber_int_t	bmu_int_t;
+
+		size_t	bmu_size_t;
+		void *	bmu_voidp;
+		double	bmu_double;
+		long	bmu_long;
+		long	(*bmu_funcp)( double );
+		char	bmu_char[4];
+	} ber_align;
+#define bm_junk	ber_align.bmu_len_t
+#define bm_data	ber_align.bmu_char[1]
+};
+#define BER_MEM_JUNK 0xddeeddeeU
+static const struct ber_mem_hdr ber_int_mem_hdr = { BER_MEM_JUNK };
+#define BER_MEM_BADADDR	((void *) &ber_int_mem_hdr.bm_data)
+#define BER_MEM_VALID(p)	do { \
+		assert( (p) != BER_MEM_BADADDR );	\
+		assert( (p) != (void *) &ber_int_mem_hdr );	\
+	} while(0)
+#else
+#define BER_MEM_VALID(p)	/* no-op */
+#endif
+
+BerMemoryFunctions *ber_int_memory_fns = NULL;
+
+#if 0 && defined( LDAP_MEMORY_DEBUG )
+void
+ber_int_memfree( void **p )
+{
+	assert( p != NULL );
+	BER_MEM_VALID( *p );
+
+	ber_memfree( p );
+
+	*p = BER_MEM_BADADDR;
+}
+#endif
+
 void
 ber_memfree( void *p )
 {
     ber_int_options.lbo_valid = LBER_INITIALIZED;
-	LBER_FREE( p );
+
+	if( p == NULL ) {
+		return;
+	}
+
+	BER_MEM_VALID( p );
+
+	if( ber_int_memory_fns == NULL ) {
+#ifdef LDAP_MEMORY_DEBUG
+		struct ber_mem_hdr *mh = (struct ber_mem_hdr *)
+			((char *)p - sizeof(struct ber_mem_hdr));
+
+		assert( mh->bm_junk == BER_MEM_JUNK );				
+		mh->bm_junk = ~BER_MEM_JUNK;
+		free( mh );
+#else
+		free( p );
+#endif
+		return;
+	}
+
+	assert( ber_int_memory_fns->bmf_free );
+
+		
+	(*ber_int_memory_fns->bmf_free)( p );
 }
 
-void *
-ber_memalloc( size_t s )
+
+void
+ber_memvfree( void **vec )
 {
+	int	i;
+
     ber_int_options.lbo_valid = LBER_INITIALIZED;
-	return LBER_MALLOC( s );
+
+	if( vec == NULL ) {
+		return;
+	}
+
+	BER_MEM_VALID( vec );
+
+	for ( i = 0; vec[i] != NULL; i++ ) {
+		LBER_FREE( vec[i] );
+	}
+
+	LBER_FREE( vec );
 }
 
+
 void *
-ber_memcalloc( size_t n, size_t s )
+ber_memalloc( ber_len_t s )
 {
     ber_int_options.lbo_valid = LBER_INITIALIZED;
-	return LBER_CALLOC( n, s );
+
+#ifdef LDAP_MEMORY_DEBUG
+	assert( s != 0 );
+#endif
+
+	if( s == 0 ) {
+		return NULL;
+	}
+
+	if( ber_int_memory_fns == NULL ) {
+#ifdef LDAP_MEMORY_DEBUG
+		struct ber_mem_hdr *mh = malloc(s + sizeof(struct ber_mem_hdr));
+
+		if( mh == NULL ) return NULL;
+
+		mh->bm_junk = BER_MEM_JUNK;
+
+		BER_MEM_VALID( &mh[1] );
+		return &mh[1];
+#else
+		return malloc( s );
+#endif
+	}
+
+	assert( ber_int_memory_fns->bmf_malloc );
+
+	return (*ber_int_memory_fns->bmf_malloc)( s );
 }
 
+
 void *
-ber_memrealloc( void* p, size_t s )
+ber_memcalloc( ber_len_t n, ber_len_t s )
 {
     ber_int_options.lbo_valid = LBER_INITIALIZED;
-	return LBER_REALLOC( p, s );
+
+#ifdef LDAP_MEMORY_DEBUG
+	assert( n != 0 && s != 0);
+#endif
+
+	if( n == 0 || s == 0 ) {
+		return NULL;
+	}
+
+	if( ber_int_memory_fns == NULL ) {
+#ifdef LDAP_MEMORY_DEBUG
+		struct ber_mem_hdr *mh = calloc(1,
+			(n * s) + sizeof(struct ber_mem_hdr) );
+
+		mh->bm_junk = BER_MEM_JUNK;
+
+		BER_MEM_VALID( &mh[1] );
+		return &mh[1];
+#else
+		return calloc( n, s );
+#endif
+	}
+
+	assert( ber_int_memory_fns->bmf_calloc );
+
+	return (*ber_int_memory_fns->bmf_calloc)( n, s );
 }
 
-BER_MEMORY_FN ber_int_realloc = NULL;
 
 void *
-ber_int_calloc( size_t n, size_t s )
+ber_memrealloc( void* p, ber_len_t s )
 {
     ber_int_options.lbo_valid = LBER_INITIALIZED;
 
-	{
-		size_t size = n * s;
-		void *p = (*ber_int_realloc)( NULL, size );
-		return p ?  memset( p, 0, size ) : p;
+	/* realloc(NULL,s) -> malloc(s) */
+	if( p == NULL ) {
+		return ber_memalloc( s );
+	}
+	
+	/* realloc(p,0) -> free(p) */
+	if( s == 0 ) {
+		ber_memfree( p );
+		return NULL;
 	}
+
+	BER_MEM_VALID( p );
+
+	if( ber_int_memory_fns == NULL ) {
+#ifdef LDAP_MEMORY_DEBUG
+		struct ber_mem_hdr *mh = (struct ber_mem_hdr *)
+			((char *)p - sizeof(struct ber_mem_hdr));
+		assert( mh->bm_junk == BER_MEM_JUNK );
+
+		p = realloc( mh, s + sizeof(struct ber_mem_hdr) );
+
+		if( p == NULL ) return NULL;
+
+		mh = p;
+
+		assert( mh->bm_junk == BER_MEM_JUNK );
+
+		BER_MEM_VALID( &mh[1] );
+		return &mh[1];
+#else
+		return realloc( p, s );
+#endif
+	}
+
+	assert( ber_int_memory_fns->bmf_realloc );
+
+	return (*ber_int_memory_fns->bmf_realloc)( p, s );
+}
+
+
+void
+ber_bvfree( struct berval *bv )
+{
+	ber_int_options.lbo_valid = LBER_INITIALIZED;
+
+	if( bv == NULL ) {
+		return;
+	}
+
+	BER_MEM_VALID( bv );
+
+	if ( bv->bv_val != NULL )
+		LBER_FREE( bv->bv_val );
+
+	LBER_FREE( (char *) bv );
+}
+
+
+void
+ber_bvecfree( struct berval **bv )
+{
+	int	i;
+
+	ber_int_options.lbo_valid = LBER_INITIALIZED;
+
+	if( bv == NULL ) {
+		return;
+	}
+
+	BER_MEM_VALID( bv );
+
+	for ( i = 0; bv[i] != NULL; i++ )
+		ber_bvfree( bv[i] );
+
+	LBER_FREE( (char *) bv );
+}
+
+
+struct berval *
+ber_bvdup(
+	LDAP_CONST struct berval *bv )
+{
+	struct berval *new;
+
+	ber_int_options.lbo_valid = LBER_INITIALIZED;
+
+	if( bv == NULL ) {
+		return NULL;
+	}
+
+	if(( new = LBER_MALLOC( sizeof(struct berval) )) == NULL ) {
+		return NULL;
+	}
+
+	if ( bv->bv_val == NULL ) {
+		new->bv_val = NULL;
+		new->bv_len = 0;
+		return new;
+	}
+
+	if(( new->bv_val = LBER_MALLOC( bv->bv_len + 1 )) == NULL ) {
+		LBER_FREE( new );
+		return NULL;
+	}
+
+	SAFEMEMCPY( new->bv_val, bv->bv_val, bv->bv_len );
+	new->bv_val[bv->bv_len] = '\0';
+	new->bv_len = bv->bv_len;
+
+	return( new );
 }
 
+char *
+ber_strdup( LDAP_CONST char *s )
+{
+	char    *p;
+	size_t	len;
+	
+	ber_int_options.lbo_valid = LBER_INITIALIZED;
+
+#ifdef LDAP_MEMORY_DEBUG
+	assert(s != NULL);			/* bv damn better point to something */
+#endif
+
+	if( s == NULL ) {
+		return( NULL );
+	}
+
+	len = strlen( s ) + 1;
+
+	if ( (p = LBER_MALLOC( len )) == NULL ) {
+		return( NULL );
+	}
+
+	SAFEMEMCPY( p, s, len );
+	return( p );
+}