/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "portable.h"
};
/* Pattern at top of allocated space */
-#define BER_MEM_JUNK 0xdeaddadaU
+#define LLBER_MEM_JUNK 0xdeaddadaU
-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, 0, 0 };
/* Note sequence and ber_int_options.lbu_meminuse are counters, but are not
* thread safe. If you want to use these values for multithreaded applications,
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 )
{
#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;
mh->bm_sequence, mh, mh->bm_length, ber_int_options.lbo_meminuse);
#endif
/* Fill the free space with poison */
- memset( mh, 0xff, mh->bm_length + sizeof(struct ber_mem_hdr) + sizeof( ber_int_t));
+ memset( mh, 0xff, mh->bm_length + sizeof(struct ber_mem_hdr) + sizeof(ber_int_t));
free( mh );
#else
free( p );
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;
+ mh->bm_top = LBER_MEM_JUNK;
mh->bm_length = s;
setdatatop( mh);
setend( (char *)&mh[1] + mh->bm_length );
(n * s) + sizeof(struct ber_mem_hdr) + sizeof(ber_int_t) );
if( mh == NULL ) return NULL;
- mh->bm_top = BER_MEM_JUNK;
+ mh->bm_top = LBER_MEM_JUNK;
mh->bm_length = n*s;
setdatatop( mh);
setend( (char *)&mh[1] + mh->bm_length );
/* realloc(NULL,s) -> malloc(s) */
if( p == NULL ) {
- return ber_memalloc( s );
+ return LBER_MALLOC( s );
}
/* realloc(p,0) -> free(p) */
if( s == 0 ) {
- ber_memfree( p );
+ LBER_FREE( p );
return NULL;
}
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;
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_MEM_VALID( bv );
- if ( bv->bv_val != NULL )
+ if ( bv->bv_val != NULL ) {
LBER_FREE( bv->bv_val );
+ }
LBER_FREE( (char *) bv );
}
BER_MEM_VALID( bv );
- for ( i = 0; bv[i] != NULL; i++ )
+ for ( i = 0; bv[i] != NULL; i++ ) {
ber_bvfree( bv[i] );
+ }
LBER_FREE( (char *) bv );
}
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 = LBER_MALLOC( 2 * sizeof(struct berval *) );
if( *bvec == NULL ) {
return -1;
BER_MEM_VALID( bvec );
/* count entries */
- for ( i = 0; bvec[i] != NULL; i++ ) {
+ for ( i = 0; (*bvec)[i] != NULL; i++ ) {
/* EMPTY */;
}
return i;
}
- new = ber_memrealloc( *bvec, (i+2) * sizeof(struct berval *));
+ new = LBER_REALLOC( *bvec, (i+2) * sizeof(struct berval *));
if( new == NULL ) {
return -1;
struct berval *
-ber_bvdup(
- LDAP_CONST struct berval *bv )
+ber_dupbv(
+ struct berval *dst, struct berval *src )
{
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 = LBER_MALLOC( sizeof(struct berval) )) == NULL ) {
+ ber_errno = LBER_ERROR_MEMORY;
+ 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 ) {
+ if(( new->bv_val = LBER_MALLOC( src->bv_len + 1 )) == NULL ) {
ber_errno = LBER_ERROR_MEMORY;
- LBER_FREE( new );
+ if ( !dst )
+ LBER_FREE( new );
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 );
+ return new;
+}
+
+
+struct berval *
+ber_bvdup(
+ struct berval *src )
+{
+ return ber_dupbv( NULL, src );
}
+
struct berval *
-ber_bvstr(
- LDAP_CONST char *s )
+ber_str2bv(
+ LDAP_CONST char *s, ber_len_t len, int dup, struct berval *bv)
{
struct berval *new;
return NULL;
}
- if(( new = LBER_MALLOC( sizeof(struct berval) )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
- return NULL;
+ if( bv ) {
+ new = bv;
+ } else {
+ if(( new = LBER_MALLOC( sizeof(struct berval) )) == NULL ) {
+ ber_errno = LBER_ERROR_MEMORY;
+ 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 = LBER_MALLOC( new->bv_len+1 )) == NULL ) {
+ ber_errno = LBER_ERROR_MEMORY;
+ if ( !bv )
+ LBER_FREE( new );
+ 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_mem2bv(
+ LDAP_CONST char *s, ber_len_t len, int dup, struct berval *bv)
{
struct berval *new;
- char *p;
ber_int_options.lbo_valid = LBER_INITIALIZED;
- if( s == NULL ) {
+ if( s == NULL || len == 0 ) {
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 = LBER_MALLOC( sizeof(struct berval) )) == NULL ) {
+ ber_errno = LBER_ERROR_MEMORY;
+ return NULL;
+ }
}
- new = ber_bvstr( p );
+ new->bv_len = len;
+ if ( dup ) {
+ if ( (new->bv_val = LBER_MALLOC( new->bv_len+1 )) == NULL ) {
+ ber_errno = LBER_ERROR_MEMORY;
+ if ( !bv )
+ LBER_FREE( new );
+ 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 );
if( s == NULL ) {
ber_errno = LBER_ERROR_PARAM;
- return( NULL );
+ return NULL;
}
len = strlen( s ) + 1;
if ( (p = LBER_MALLOC( len )) == NULL ) {
ber_errno = LBER_ERROR_MEMORY;
- return( NULL );
+ return NULL;
+ }
+
+ AC_MEMCPY( p, s, len );
+ return p;
+}
+
+char *
+ber_strndup( LDAP_CONST char *s, ber_len_t l )
+{
+ 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 ) {
+ ber_errno = LBER_ERROR_PARAM;
+ return NULL;
+ }
+
+ len = strlen( s );
+
+ if ( len > l ) {
+ len = l;
+ }
+
+ if ( (p = LBER_MALLOC( len + 1 )) == NULL ) {
+ ber_errno = LBER_ERROR_MEMORY;
+ return NULL;
+ }
+
+ AC_MEMCPY( p, s, len );
+ p[ len ] = '\0';
+ return p;
+}
+
+char *
+ber_strndup__( LDAP_CONST char *s, size_t l )
+{
+ char *p;
+ size_t len;
+
+ if ( s == NULL ) {
+ return NULL;
+ }
+
+ len = strlen( s );
+ if (( p = LBER_MALLOC( len + 1 ) ) == NULL ) {
+ return NULL;
}
AC_MEMCPY( p, s, len );
- return( p );
+ p[ len ] = '\0';
+ return p;
}
+
+void
+ber_bvarray_free( BerVarray a )
+{
+ int i;
+
+ ber_int_options.lbo_valid = LBER_INITIALIZED;
+
+ if (a) {
+ BER_MEM_VALID( a );
+
+ for (i=0; a[i].bv_val; i++) {
+ LBER_FREE(a[i].bv_val);
+ }
+
+ LBER_FREE(a);
+ }
+}
+
+int
+ber_bvarray_add( BerVarray *a, BerValue *bv )
+{
+ int n;
+
+ ber_int_options.lbo_valid = LBER_INITIALIZED;
+
+ if ( *a == NULL ) {
+ if (bv == NULL) {
+ return 0;
+ }
+ n = 0;
+ *a = (BerValue *) LBER_MALLOC( 2 * sizeof(BerValue) );
+ } else {
+ BER_MEM_VALID( a );
+
+ for ( n = 0; *a != NULL && (*a)[n].bv_val != NULL; n++ ) {
+ ; /* NULL */
+ }
+
+ if (bv == NULL) {
+ return n;
+ }
+ *a = (BerValue *) LBER_REALLOC( (char *) *a,
+ (n + 2) * sizeof(BerValue) );
+ }
+ if ( *a == NULL ) {
+ return -1;
+ }
+
+ (*a)[n++] = *bv;
+ (*a)[n].bv_val = NULL;
+
+ return n;
+}
+