X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fmemory.c;h=726500d018dae9ab6c8beddcde0adb0a1ca027f1;hb=2dd578221b3dbaf7ba2308b63c3cc46154323cae;hp=90720fa792557b79620fb69f4e7f301f8ffbb133;hpb=1dc469e064e212aee9ae4d26438f952536ab754a;p=openldap
diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c
index 90720fa792..726500d018 100644
--- a/libraries/liblber/memory.c
+++ b/libraries/liblber/memory.c
@@ -1,8 +1,18 @@
/* $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-2011 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
+ * .
*/
+
#include "portable.h"
#include
@@ -11,19 +21,18 @@
#include "lber-int.h"
#ifdef LDAP_MEMORY_TRACE
-# ifndef LDAP_MEMORY_DEBUG
-# define LDAP_MEMORY_DEBUG 1
-# endif
#include
#endif
-#if LDAP_MEMORY_DEBUG
+#ifdef LDAP_MEMORY_DEBUG
/*
* LDAP_MEMORY_DEBUG should only be enabled for the purposes of
* debugging memory management within OpenLDAP libraries and slapd.
- * It should only be enabled by an experienced developer as it
- * causes the inclusion of numerous assert()'s, many of which may
- * be triggered by a prefectly valid program.
+ *
+ * It should only be enabled by an experienced developer as it causes
+ * the inclusion of numerous assert()'s, many of which may be triggered
+ * by a prefectly valid program. If LDAP_MEMORY_DEBUG & 2 is true,
+ * that includes asserts known to break both slapd and current clients.
*
* The code behind this macro is subject to change as needed to
* support this testing.
@@ -53,17 +62,18 @@ struct ber_mem_hdr {
};
/* Pattern at top of allocated space */
-#define BER_MEM_JUNK 0xdeaddadaU
+#define LBER_MEM_JUNK ((ber_int_t) 0xdeaddada)
-static const struct ber_mem_hdr ber_int_mem_hdr = { BER_MEM_JUNK, 0, 0 };
+static const struct ber_mem_hdr ber_int_mem_hdr = { LBER_MEM_JUNK };
-/* Note sequence and ber_int_options.lbu_meminuse are counters, but are not
+/* Note sequence and ber_int_meminuse are counters, but are not
* thread safe. If you want to use these values for multithreaded applications,
* you must put mutexes around them, otherwise they will have incorrect values.
* When debugging, if you sort the debug output, the sequence number will
* put allocations/frees together. It is then a simple matter to write a script
* to find any allocations that don't have a buffer free function.
*/
+long ber_int_meminuse = 0;
#ifdef LDAP_MEMORY_TRACE
static ber_int_t sequence = 0;
#endif
@@ -112,42 +122,28 @@ static unsigned char endpattern[4] = { 0xd1, 0xed, 0xde, 0xca };
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_memfree_x( void *p, void *ctx )
{
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
if( p == NULL ) {
return;
}
BER_MEM_VALID( p );
- if( ber_int_memory_fns == NULL ) {
+ if( ber_int_memory_fns == NULL || ctx == NULL ) {
#ifdef LDAP_MEMORY_DEBUG
struct ber_mem_hdr *mh = (struct ber_mem_hdr *)
((char *)p - sizeof(struct ber_mem_hdr));
- assert( mh->bm_top == BER_MEM_JUNK);
+ assert( mh->bm_top == LBER_MEM_JUNK);
assert( testdatatop( mh));
assert( testend( (char *)&mh[1] + mh->bm_length) );
- ber_int_options.lbo_meminuse -= mh->bm_length;
+ ber_int_meminuse -= mh->bm_length;
#ifdef LDAP_MEMORY_TRACE
- fprintf(stderr, "0x%08x 0x%08x -f- %d ber_memfree %d\n",
- mh->bm_sequence, mh, mh->bm_length, ber_int_options.lbo_meminuse);
+ fprintf(stderr, "0x%08lx 0x%08lx -f- %ld ber_memfree %ld\n",
+ (long)mh->bm_sequence, (long)mh, (long)mh->bm_length,
+ ber_int_meminuse);
#endif
/* Fill the free space with poison */
memset( mh, 0xff, mh->bm_length + sizeof(struct ber_mem_hdr) + sizeof(ber_int_t));
@@ -158,19 +154,22 @@ ber_memfree( void *p )
return;
}
- assert( ber_int_memory_fns->bmf_free );
+ assert( ber_int_memory_fns->bmf_free != 0 );
- (*ber_int_memory_fns->bmf_free)( p );
+ (*ber_int_memory_fns->bmf_free)( p, ctx );
}
+void
+ber_memfree( void *p )
+{
+ ber_memfree_x(p, NULL);
+}
void
-ber_memvfree( void **vec )
+ber_memvfree_x( void **vec, void *ctx )
{
int i;
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
if( vec == NULL ) {
return;
}
@@ -178,54 +177,58 @@ ber_memvfree( void **vec )
BER_MEM_VALID( vec );
for ( i = 0; vec[i] != NULL; i++ ) {
- LBER_FREE( vec[i] );
+ ber_memfree_x( vec[i], ctx );
}
- LBER_FREE( vec );
+ ber_memfree_x( vec, ctx );
}
+void
+ber_memvfree( void **vec )
+{
+ ber_memvfree_x( vec, NULL );
+}
void *
-ber_memalloc( ber_len_t s )
+ber_memalloc_x( ber_len_t s, void *ctx )
{
void *new;
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
-#ifdef LDAP_MEMORY_DEBUG
- assert( s != 0 );
-#endif
if( s == 0 ) {
+ LDAP_MEMORY_DEBUG_ASSERT( s != 0 );
return NULL;
}
- if( ber_int_memory_fns == NULL ) {
+ if( ber_int_memory_fns == NULL || ctx == NULL ) {
#ifdef LDAP_MEMORY_DEBUG
- struct ber_mem_hdr *mh = malloc(s + sizeof(struct ber_mem_hdr) + sizeof( ber_int_t));
- if( mh == NULL ) return NULL;
-
- mh->bm_top = BER_MEM_JUNK;
+ new = malloc(s + sizeof(struct ber_mem_hdr) + sizeof( ber_int_t));
+ if( new )
+ {
+ struct ber_mem_hdr *mh = new;
+ mh->bm_top = LBER_MEM_JUNK;
mh->bm_length = s;
setdatatop( mh);
setend( (char *)&mh[1] + mh->bm_length );
- ber_int_options.lbo_meminuse += mh->bm_length; /* Count mem inuse */
+ ber_int_meminuse += mh->bm_length; /* Count mem inuse */
#ifdef LDAP_MEMORY_TRACE
mh->bm_sequence = sequence++;
- fprintf(stderr, "0x%08x 0x%08x -a- %d ber_memalloc %d\n",
- mh->bm_sequence, mh, mh->bm_length, ber_int_options.lbo_meminuse);
+ fprintf(stderr, "0x%08lx 0x%08lx -a- %ld ber_memalloc %ld\n",
+ (long)mh->bm_sequence, (long)mh, (long)mh->bm_length,
+ ber_int_meminuse);
#endif
/* poison new memory */
memset( (char *)&mh[1], 0xff, s);
BER_MEM_VALID( &mh[1] );
new = &mh[1];
+ }
#else
new = malloc( s );
#endif
} else {
- new = (*ber_int_memory_fns->bmf_malloc)( s );
+ new = (*ber_int_memory_fns->bmf_malloc)( s, ctx );
}
if( new == NULL ) {
@@ -235,47 +238,53 @@ ber_memalloc( ber_len_t s )
return new;
}
+void *
+ber_memalloc( ber_len_t s )
+{
+ return ber_memalloc_x( s, NULL );
+}
void *
-ber_memcalloc( ber_len_t n, ber_len_t s )
+ber_memcalloc_x( ber_len_t n, ber_len_t s, void *ctx )
{
void *new;
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
-#ifdef LDAP_MEMORY_DEBUG
- assert( n != 0 && s != 0);
-#endif
if( n == 0 || s == 0 ) {
+ LDAP_MEMORY_DEBUG_ASSERT( n != 0 && s != 0);
return NULL;
}
- if( ber_int_memory_fns == NULL ) {
+ if( ber_int_memory_fns == NULL || ctx == NULL ) {
#ifdef LDAP_MEMORY_DEBUG
- struct ber_mem_hdr *mh = calloc(1,
- (n * s) + sizeof(struct ber_mem_hdr) + sizeof(ber_int_t) );
- if( mh == NULL ) return NULL;
-
- mh->bm_top = BER_MEM_JUNK;
+ new = n < (-sizeof(struct ber_mem_hdr) - sizeof(ber_int_t)) / s
+ ? calloc(1, n*s + sizeof(struct ber_mem_hdr) + sizeof(ber_int_t))
+ : NULL;
+ if( new )
+ {
+ struct ber_mem_hdr *mh = new;
+
+ mh->bm_top = LBER_MEM_JUNK;
mh->bm_length = n*s;
setdatatop( mh);
setend( (char *)&mh[1] + mh->bm_length );
- ber_int_options.lbo_meminuse += mh->bm_length;
+ ber_int_meminuse += mh->bm_length;
#ifdef LDAP_MEMORY_TRACE
mh->bm_sequence = sequence++;
- fprintf(stderr, "0x%08x 0x%08x -a- %d ber_memcalloc %d\n",
- mh->bm_sequence, mh, mh->bm_length, ber_int_options.lbo_meminuse);
+ fprintf(stderr, "0x%08lx 0x%08lx -a- %ld ber_memcalloc %ld\n",
+ (long)mh->bm_sequence, (long)mh, (long)mh->bm_length,
+ ber_int_meminuse);
#endif
BER_MEM_VALID( &mh[1] );
new = &mh[1];
+ }
#else
new = calloc( n, s );
#endif
} else {
- new = (*ber_int_memory_fns->bmf_calloc)( n, s );
+ new = (*ber_int_memory_fns->bmf_calloc)( n, s, ctx );
}
if( new == NULL ) {
@@ -285,32 +294,36 @@ ber_memcalloc( ber_len_t n, ber_len_t s )
return new;
}
+void *
+ber_memcalloc( ber_len_t n, ber_len_t s )
+{
+ return ber_memcalloc_x( n, s, NULL );
+}
void *
-ber_memrealloc( void* p, ber_len_t s )
+ber_memrealloc_x( void* p, ber_len_t s, void *ctx )
{
void *new = NULL;
- ber_int_options.lbo_valid = LBER_INITIALIZED;
/* realloc(NULL,s) -> malloc(s) */
if( p == NULL ) {
- return ber_memalloc( s );
+ return ber_memalloc_x( s, ctx );
}
/* realloc(p,0) -> free(p) */
if( s == 0 ) {
- ber_memfree( p );
+ ber_memfree_x( p, ctx );
return NULL;
}
BER_MEM_VALID( p );
- if( ber_int_memory_fns == NULL ) {
+ if( ber_int_memory_fns == NULL || ctx == NULL ) {
#ifdef LDAP_MEMORY_DEBUG
ber_int_t oldlen;
struct ber_mem_hdr *mh = (struct ber_mem_hdr *)
((char *)p - sizeof(struct ber_mem_hdr));
- assert( mh->bm_top == BER_MEM_JUNK);
+ assert( mh->bm_top == LBER_MEM_JUNK);
assert( testdatatop( mh));
assert( testend( (char *)&mh[1] + mh->bm_length) );
oldlen = mh->bm_length;
@@ -324,18 +337,19 @@ ber_memrealloc( void* p, ber_len_t s )
mh = p;
mh->bm_length = s;
setend( (char *)&mh[1] + mh->bm_length );
- if( (s - oldlen) > 0 ) {
+ if( s > oldlen ) {
/* poison any new memory */
memset( (char *)&mh[1] + oldlen, 0xff, s - oldlen);
}
- assert( mh->bm_top == BER_MEM_JUNK);
+ assert( mh->bm_top == LBER_MEM_JUNK);
assert( testdatatop( mh));
- ber_int_options.lbo_meminuse += s - oldlen;
+ ber_int_meminuse += s - oldlen;
#ifdef LDAP_MEMORY_TRACE
- fprintf(stderr, "0x%08x 0x%08x -a- %d ber_memrealloc %d\n",
- mh->bm_sequence, mh, mh->bm_length, ber_int_options.lbo_meminuse);
+ fprintf(stderr, "0x%08lx 0x%08lx -a- %ld ber_memrealloc %ld\n",
+ (long)mh->bm_sequence, (long)mh, (long)mh->bm_length,
+ ber_int_meminuse);
#endif
BER_MEM_VALID( &mh[1] );
return &mh[1];
@@ -343,7 +357,7 @@ ber_memrealloc( void* p, ber_len_t s )
new = realloc( p, s );
#endif
} else {
- new = (*ber_int_memory_fns->bmf_realloc)( p, s );
+ new = (*ber_int_memory_fns->bmf_realloc)( p, s, ctx );
}
if( new == NULL ) {
@@ -353,12 +367,15 @@ ber_memrealloc( void* p, ber_len_t s )
return new;
}
+void *
+ber_memrealloc( void* p, ber_len_t s )
+{
+ return ber_memrealloc_x( p, s, NULL );
+}
void
-ber_bvfree( struct berval *bv )
+ber_bvfree_x( struct berval *bv, void *ctx )
{
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
if( bv == NULL ) {
return;
}
@@ -366,48 +383,59 @@ ber_bvfree( struct berval *bv )
BER_MEM_VALID( bv );
if ( bv->bv_val != NULL ) {
- LBER_FREE( bv->bv_val );
+ ber_memfree_x( bv->bv_val, ctx );
}
- LBER_FREE( (char *) bv );
+ ber_memfree_x( (char *) bv, ctx );
}
+void
+ber_bvfree( struct berval *bv )
+{
+ ber_bvfree_x( bv, NULL );
+}
void
-ber_bvecfree( struct berval **bv )
+ber_bvecfree_x( struct berval **bv, void *ctx )
{
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] );
+ /* count elements */
+ for ( i = 0; bv[i] != NULL; i++ ) ;
+
+ /* free in reverse order */
+ for ( i--; i >= 0; i-- ) {
+ ber_bvfree_x( bv[i], ctx );
}
- LBER_FREE( (char *) bv );
+ ber_memfree_x( (char *) bv, ctx );
+}
+
+void
+ber_bvecfree( struct berval **bv )
+{
+ ber_bvecfree_x( bv, NULL );
}
int
-ber_bvecadd( struct berval ***bvec, struct berval *bv )
+ber_bvecadd_x( struct berval ***bvec, struct berval *bv, void *ctx )
{
ber_len_t i;
struct berval **new;
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
- if( bvec == NULL ) {
+ if( *bvec == NULL ) {
if( bv == NULL ) {
/* nothing to add */
return 0;
}
- *bvec = ber_memalloc( 2 * sizeof(struct berval *) );
+ *bvec = ber_memalloc_x( 2 * sizeof(struct berval *), ctx );
if( *bvec == NULL ) {
return -1;
@@ -422,7 +450,7 @@ ber_bvecadd( struct berval ***bvec, struct berval *bv )
BER_MEM_VALID( bvec );
/* count entries */
- for ( i = 0; bvec[i] != NULL; i++ ) {
+ for ( i = 0; (*bvec)[i] != NULL; i++ ) {
/* EMPTY */;
}
@@ -430,7 +458,7 @@ ber_bvecadd( struct berval ***bvec, struct berval *bv )
return i;
}
- new = ber_memrealloc( *bvec, (i+2) * sizeof(struct berval *));
+ new = ber_memrealloc_x( *bvec, (i+2) * sizeof(struct berval *), ctx);
if( new == NULL ) {
return -1;
@@ -444,106 +472,159 @@ ber_bvecadd( struct berval ***bvec, struct berval *bv )
return i;
}
+int
+ber_bvecadd( struct berval ***bvec, struct berval *bv )
+{
+ return ber_bvecadd_x( bvec, bv, NULL );
+}
struct berval *
-ber_bvdup(
- LDAP_CONST struct berval *bv )
+ber_dupbv_x(
+ struct berval *dst, struct berval *src, void *ctx )
{
struct berval *new;
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
- if( bv == NULL ) {
+ if( src == NULL ) {
ber_errno = LBER_ERROR_PARAM;
return NULL;
}
- if(( new = LBER_MALLOC( sizeof(struct berval) )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
- return NULL;
+ if ( dst ) {
+ new = dst;
+ } else {
+ if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
+ return NULL;
+ }
}
- if ( bv->bv_val == NULL ) {
+ if ( src->bv_val == NULL ) {
new->bv_val = NULL;
new->bv_len = 0;
return new;
}
- if(( new->bv_val = LBER_MALLOC( bv->bv_len + 1 )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
- LBER_FREE( new );
+ if(( new->bv_val = ber_memalloc_x( src->bv_len + 1, ctx )) == NULL ) {
+ if ( !dst )
+ ber_memfree_x( new, ctx );
return NULL;
}
- AC_MEMCPY( new->bv_val, bv->bv_val, bv->bv_len );
- new->bv_val[bv->bv_len] = '\0';
- new->bv_len = bv->bv_len;
+ AC_MEMCPY( new->bv_val, src->bv_val, src->bv_len );
+ new->bv_val[src->bv_len] = '\0';
+ new->bv_len = src->bv_len;
return new;
}
struct berval *
-ber_bvstr(
- LDAP_CONST char *s )
+ber_dupbv(
+ struct berval *dst, struct berval *src )
{
- struct berval *new;
+ return ber_dupbv_x( dst, src, NULL );
+}
- ber_int_options.lbo_valid = LBER_INITIALIZED;
+struct berval *
+ber_bvdup(
+ struct berval *src )
+{
+ return ber_dupbv_x( NULL, src, NULL );
+}
+
+struct berval *
+ber_str2bv_x(
+ LDAP_CONST char *s, ber_len_t len, int dup, struct berval *bv,
+ void *ctx)
+{
+ struct berval *new;
if( s == NULL ) {
ber_errno = LBER_ERROR_PARAM;
return NULL;
}
- if(( new = LBER_MALLOC( sizeof(struct berval) )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
- return NULL;
+ if( bv ) {
+ new = bv;
+ } else {
+ if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
+ return NULL;
+ }
}
- new->bv_val = (char *) s;
- new->bv_len = strlen( s );
+ new->bv_len = len ? len : strlen( s );
+ if ( dup ) {
+ if ( (new->bv_val = ber_memalloc_x( new->bv_len+1, ctx )) == NULL ) {
+ if ( !bv )
+ ber_memfree_x( new, ctx );
+ return NULL;
+ }
+
+ AC_MEMCPY( new->bv_val, s, new->bv_len );
+ new->bv_val[new->bv_len] = '\0';
+ } else {
+ new->bv_val = (char *) s;
+ }
return( new );
}
struct berval *
-ber_bvstrdup(
- LDAP_CONST char *s )
+ber_str2bv(
+ LDAP_CONST char *s, ber_len_t len, int dup, struct berval *bv)
{
- struct berval *new;
- char *p;
+ return ber_str2bv_x( s, len, dup, bv, NULL );
+}
- ber_int_options.lbo_valid = LBER_INITIALIZED;
+struct berval *
+ber_mem2bv_x(
+ LDAP_CONST char *s, ber_len_t len, int dup, struct berval *bv,
+ void *ctx)
+{
+ struct berval *new;
if( s == NULL ) {
ber_errno = LBER_ERROR_PARAM;
return NULL;
}
- p = LBER_STRDUP( s );
-
- if( p == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
- return NULL;
+ if( bv ) {
+ new = bv;
+ } else {
+ if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
+ return NULL;
+ }
}
- new = ber_bvstr( p );
+ new->bv_len = len;
+ if ( dup ) {
+ if ( (new->bv_val = ber_memalloc_x( new->bv_len+1, ctx )) == NULL ) {
+ if ( !bv ) {
+ ber_memfree_x( new, ctx );
+ }
+ return NULL;
+ }
- if( new == NULL || *p == '\0' ) {
- LBER_FREE( p );
+ AC_MEMCPY( new->bv_val, s, new->bv_len );
+ new->bv_val[new->bv_len] = '\0';
+ } else {
+ new->bv_val = (char *) s;
}
- return new;
+ return( new );
+}
+
+struct berval *
+ber_mem2bv(
+ LDAP_CONST char *s, ber_len_t len, int dup, struct berval *bv)
+{
+ return ber_mem2bv_x( s, len, dup, bv, NULL );
}
char *
-ber_strdup( LDAP_CONST char *s )
+ber_strdup_x( LDAP_CONST char *s, void *ctx )
{
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
@@ -554,12 +635,186 @@ ber_strdup( LDAP_CONST char *s )
}
len = strlen( s ) + 1;
+ if ( (p = ber_memalloc_x( len, ctx )) != NULL ) {
+ AC_MEMCPY( p, s, len );
+ }
- if ( (p = LBER_MALLOC( len )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
+ return p;
+}
+
+char *
+ber_strdup( LDAP_CONST char *s )
+{
+ return ber_strdup_x( s, NULL );
+}
+
+ber_len_t
+ber_strnlen( LDAP_CONST char *s, ber_len_t len )
+{
+ ber_len_t l;
+
+ for ( l = 0; l < len && s[l] != '\0'; l++ ) ;
+
+ return l;
+}
+
+char *
+ber_strndup_x( LDAP_CONST char *s, ber_len_t l, void *ctx )
+{
+ char *p;
+ size_t len;
+
+#ifdef LDAP_MEMORY_DEBUG
+ assert(s != NULL); /* bv damn better point to something */
+#endif
+
+ if( s == NULL ) {
+ ber_errno = LBER_ERROR_PARAM;
return NULL;
}
- AC_MEMCPY( p, s, len );
+ len = ber_strnlen( s, l );
+ if ( (p = ber_memalloc_x( len + 1, ctx )) != NULL ) {
+ AC_MEMCPY( p, s, len );
+ p[len] = '\0';
+ }
+
return p;
}
+
+char *
+ber_strndup( LDAP_CONST char *s, ber_len_t l )
+{
+ return ber_strndup_x( s, l, NULL );
+}
+
+/*
+ * dst is resized as required by src and the value of src is copied into dst
+ * dst->bv_val must be NULL (and dst->bv_len must be 0), or it must be
+ * alloc'ed with the context ctx
+ */
+struct berval *
+ber_bvreplace_x( struct berval *dst, LDAP_CONST struct berval *src, void *ctx )
+{
+ assert( dst != NULL );
+ assert( !BER_BVISNULL( src ) );
+
+ if ( BER_BVISNULL( dst ) || dst->bv_len < src->bv_len ) {
+ dst->bv_val = ber_memrealloc_x( dst->bv_val, src->bv_len + 1, ctx );
+ }
+
+ AC_MEMCPY( dst->bv_val, src->bv_val, src->bv_len + 1 );
+ dst->bv_len = src->bv_len;
+
+ return dst;
+}
+
+struct berval *
+ber_bvreplace( struct berval *dst, LDAP_CONST struct berval *src )
+{
+ return ber_bvreplace_x( dst, src, NULL );
+}
+
+void
+ber_bvarray_free_x( BerVarray a, void *ctx )
+{
+ int i;
+
+ if (a) {
+ BER_MEM_VALID( a );
+
+ /* count elements */
+ for (i=0; a[i].bv_val; i++) ;
+
+ /* free in reverse order */
+ for (i--; i>=0; i--) {
+ ber_memfree_x(a[i].bv_val, ctx);
+ }
+
+ ber_memfree_x(a, ctx);
+ }
+}
+
+void
+ber_bvarray_free( BerVarray a )
+{
+ ber_bvarray_free_x(a, NULL);
+}
+
+int
+ber_bvarray_dup_x( BerVarray *dst, BerVarray src, void *ctx )
+{
+ int i, j;
+ BerVarray new;
+
+ if ( !src ) {
+ *dst = NULL;
+ return 0;
+ }
+
+ for (i=0; !BER_BVISNULL( &src[i] ); i++) ;
+ new = ber_memalloc_x(( i+1 ) * sizeof(BerValue), ctx );
+ if ( !new )
+ return -1;
+ for (j=0; j