X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fmemory.c;h=f45ec52b68d8d6968d6e2a4d94b90d795f8cb134;hb=b03d8abcdeb6201bbd656838c24a74e40c64f273;hp=71e61ca1270e9ec6ccef92d102fcb80b2c187751;hpb=6939c531700652491f4be4688c6a1f35a1ab8a18;p=openldap
diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c
index 71e61ca127..f45ec52b68 100644
--- a/libraries/liblber/memory.c
+++ b/libraries/liblber/memory.c
@@ -1,8 +1,18 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2006 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,9 +21,6 @@
#include "lber-int.h"
#ifdef LDAP_MEMORY_TRACE
-# ifndef LDAP_MEMORY_DEBUG
-# define LDAP_MEMORY_DEBUG 1
-# endif
#include
#endif
@@ -53,11 +60,11 @@ struct ber_mem_hdr {
};
/* Pattern at top of allocated space */
-#define LLBER_MEM_JUNK 0xdeaddadaU
+#define LBER_MEM_JUNK 0xdeaddadaU
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
+/* 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
@@ -113,28 +120,27 @@ static unsigned char endpattern[4] = { 0xd1, 0xed, 0xde, 0xca };
BerMemoryFunctions *ber_int_memory_fns = NULL;
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 == 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));
@@ -145,19 +151,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;
}
@@ -165,18 +174,22 @@ 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 );
@@ -186,7 +199,7 @@ ber_memalloc( ber_len_t s )
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;
@@ -196,12 +209,13 @@ ber_memalloc( ber_len_t 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);
@@ -212,7 +226,7 @@ ber_memalloc( ber_len_t s )
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 ) {
@@ -222,12 +236,16 @@ 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);
@@ -237,7 +255,7 @@ ber_memcalloc( ber_len_t n, ber_len_t s )
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) );
@@ -248,12 +266,13 @@ ber_memcalloc( ber_len_t n, ber_len_t 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];
@@ -262,7 +281,7 @@ ber_memcalloc( ber_len_t n, ber_len_t 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 ) {
@@ -272,27 +291,31 @@ 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 LBER_MALLOC( s );
+ return ber_memalloc_x( s, ctx );
}
/* realloc(p,0) -> free(p) */
if( s == 0 ) {
- LBER_FREE( 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 *)
@@ -311,7 +334,7 @@ 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);
}
@@ -319,10 +342,11 @@ ber_memrealloc( void* p, ber_len_t s )
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];
@@ -330,7 +354,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 ) {
@@ -340,12 +364,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;
}
@@ -353,48 +380,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( bv == NULL ) {
/* nothing to add */
return 0;
}
- *bvec = LBER_MALLOC( 2 * sizeof(struct berval *) );
+ *bvec = ber_memalloc_x( 2 * sizeof(struct berval *), ctx );
if( *bvec == NULL ) {
return -1;
@@ -417,7 +455,7 @@ ber_bvecadd( struct berval ***bvec, struct berval *bv )
return i;
}
- new = LBER_REALLOC( *bvec, (i+2) * sizeof(struct berval *));
+ new = ber_memrealloc_x( *bvec, (i+2) * sizeof(struct berval *), ctx);
if( new == NULL ) {
return -1;
@@ -431,15 +469,18 @@ 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_dupbv(
- struct berval *dst, struct berval *src )
+ber_dupbv_x(
+ struct berval *dst, struct berval *src, void *ctx )
{
struct berval *new;
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
if( src == NULL ) {
ber_errno = LBER_ERROR_PARAM;
return NULL;
@@ -448,7 +489,7 @@ ber_dupbv(
if ( dst ) {
new = dst;
} else {
- if(( new = LBER_MALLOC( sizeof(struct berval) )) == NULL ) {
+ if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
ber_errno = LBER_ERROR_MEMORY;
return NULL;
}
@@ -460,10 +501,10 @@ ber_dupbv(
return new;
}
- if(( new->bv_val = LBER_MALLOC( src->bv_len + 1 )) == NULL ) {
+ if(( new->bv_val = ber_memalloc_x( src->bv_len + 1, ctx )) == NULL ) {
ber_errno = LBER_ERROR_MEMORY;
if ( !dst )
- LBER_FREE( new );
+ ber_memfree_x( new, ctx );
return NULL;
}
@@ -474,23 +515,27 @@ ber_dupbv(
return new;
}
+struct berval *
+ber_dupbv(
+ struct berval *dst, struct berval *src )
+{
+ return ber_dupbv_x( dst, src, NULL );
+}
struct berval *
ber_bvdup(
struct berval *src )
{
- return ber_dupbv( NULL, src );
+ return ber_dupbv_x( NULL, src, NULL );
}
-
struct berval *
-ber_str2bv(
- LDAP_CONST char *s, ber_len_t len, int dup, struct berval *bv)
+ber_str2bv_x(
+ LDAP_CONST char *s, ber_len_t len, int dup, struct berval *bv,
+ void *ctx)
{
struct berval *new;
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
if( s == NULL ) {
ber_errno = LBER_ERROR_PARAM;
return NULL;
@@ -499,7 +544,7 @@ ber_str2bv(
if( bv ) {
new = bv;
} else {
- if(( new = LBER_MALLOC( sizeof(struct berval) )) == NULL ) {
+ if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
ber_errno = LBER_ERROR_MEMORY;
return NULL;
}
@@ -507,10 +552,10 @@ ber_str2bv(
new->bv_len = len ? len : strlen( s );
if ( dup ) {
- if ( (new->bv_val = LBER_MALLOC( new->bv_len+1 )) == NULL ) {
+ if ( (new->bv_val = ber_memalloc_x( new->bv_len+1, ctx )) == NULL ) {
ber_errno = LBER_ERROR_MEMORY;
if ( !bv )
- LBER_FREE( new );
+ ber_memfree_x( new, ctx );
return NULL;
}
@@ -524,12 +569,18 @@ ber_str2bv(
}
struct berval *
-ber_mem2bv(
+ber_str2bv(
LDAP_CONST char *s, ber_len_t len, int dup, struct berval *bv)
{
- struct berval *new;
+ 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;
@@ -539,7 +590,7 @@ ber_mem2bv(
if( bv ) {
new = bv;
} else {
- if(( new = LBER_MALLOC( sizeof(struct berval) )) == NULL ) {
+ if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
ber_errno = LBER_ERROR_MEMORY;
return NULL;
}
@@ -547,10 +598,11 @@ ber_mem2bv(
new->bv_len = len;
if ( dup ) {
- if ( (new->bv_val = LBER_MALLOC( new->bv_len+1 )) == NULL ) {
+ if ( (new->bv_val = ber_memalloc_x( new->bv_len+1, ctx )) == NULL ) {
ber_errno = LBER_ERROR_MEMORY;
- if ( !bv )
- LBER_FREE( new );
+ if ( !bv ) {
+ ber_memfree_x( new, ctx );
+ }
return NULL;
}
@@ -563,14 +615,19 @@ ber_mem2bv(
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
@@ -582,7 +639,7 @@ ber_strdup( LDAP_CONST char *s )
len = strlen( s ) + 1;
- if ( (p = LBER_MALLOC( len )) == NULL ) {
+ if ( (p = ber_memalloc_x( len, ctx )) == NULL ) {
ber_errno = LBER_ERROR_MEMORY;
return NULL;
}
@@ -592,13 +649,17 @@ ber_strdup( LDAP_CONST char *s )
}
char *
-ber_strndup( LDAP_CONST char *s, ber_len_t l )
+ber_strdup( LDAP_CONST char *s )
+{
+ return ber_strdup_x( s, NULL );
+}
+
+char *
+ber_strndup_x( LDAP_CONST char *s, ber_len_t l, 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
@@ -614,68 +675,86 @@ ber_strndup( LDAP_CONST char *s, ber_len_t l )
len = l;
}
- if ( (p = LBER_MALLOC( len + 1 )) == NULL ) {
+ if ( (p = ber_memalloc_x( len + 1, ctx )) == NULL ) {
ber_errno = LBER_ERROR_MEMORY;
return NULL;
}
AC_MEMCPY( p, s, len );
- p[ len ] = '\0';
+ p[len] = '\0';
return p;
}
char *
-ber_strndup__( LDAP_CONST char *s, size_t l )
+ber_strndup( LDAP_CONST char *s, ber_len_t l )
{
- char *p;
- size_t len;
+ return ber_strndup_x( s, l, NULL );
+}
- if ( s == NULL ) {
- return 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 );
- len = strlen( s );
- if (( p = LBER_MALLOC( len + 1 ) ) == NULL ) {
- return NULL;
+ if ( dst->bv_len < src->bv_len ) {
+ dst->bv_val = ber_memrealloc_x( dst->bv_val, src->bv_len + 1, ctx );
}
- AC_MEMCPY( p, s, len );
- p[ len ] = '\0';
- return p;
+ 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( BerVarray a )
+ber_bvarray_free_x( BerVarray a, void *ctx )
{
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);
+ /* 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);
}
- LBER_FREE(a);
+ ber_memfree_x(a, ctx);
}
}
+void
+ber_bvarray_free( BerVarray a )
+{
+ ber_bvarray_free_x(a, NULL);
+}
+
int
-ber_bvarray_add( BerVarray *a, BerValue *bv )
+ber_bvarray_add_x( BerVarray *a, BerValue *bv, void *ctx )
{
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) );
+ *a = (BerValue *) ber_memalloc_x( 2 * sizeof(BerValue), ctx );
if ( *a == NULL ) {
return -1;
}
@@ -692,8 +771,8 @@ ber_bvarray_add( BerVarray *a, BerValue *bv )
return n;
}
- atmp = (BerValue *) LBER_REALLOC( (char *) *a,
- (n + 2) * sizeof(BerValue) );
+ atmp = (BerValue *) ber_memrealloc_x( (char *) *a,
+ (n + 2) * sizeof(BerValue), ctx );
if( atmp == NULL ) {
return -1;
@@ -708,3 +787,8 @@ ber_bvarray_add( BerVarray *a, BerValue *bv )
return n;
}
+int
+ber_bvarray_add( BerVarray *a, BerValue *bv )
+{
+ return ber_bvarray_add_x( a, bv, NULL );
+}