/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <stdio.h>
#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.
};
/* Pattern at top of allocated space */
-#define LBER_MEM_JUNK 0xdeaddadaU
+#define LBER_MEM_JUNK ((ber_int_t) 0xdeaddada)
-static const struct ber_mem_hdr ber_int_mem_hdr = { LBER_MEM_JUNK, 0, 0 };
+static const struct ber_mem_hdr ber_int_mem_hdr = { LBER_MEM_JUNK };
/* Note sequence and ber_int_meminuse are counters, but are not
* thread safe. If you want to use these values for multithreaded applications,
* 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
{
void *new;
-#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 || 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;
-
+ 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);
BER_MEM_VALID( &mh[1] );
new = &mh[1];
+ }
#else
new = malloc( s );
#endif
{
void *new;
-#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 || 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;
+ 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;
#endif
BER_MEM_VALID( &mh[1] );
new = &mh[1];
+ }
#else
new = calloc( n, s );
#endif
new = dst;
} else {
if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
return NULL;
}
}
}
if(( new->bv_val = ber_memalloc_x( src->bv_len + 1, ctx )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
if ( !dst )
ber_memfree_x( new, ctx );
return NULL;
new = bv;
} else {
if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
return NULL;
}
}
new->bv_len = len ? len : strlen( s );
if ( dup ) {
if ( (new->bv_val = ber_memalloc_x( new->bv_len+1, ctx )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
if ( !bv )
ber_memfree_x( new, ctx );
return NULL;
new = bv;
} else {
if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
return NULL;
}
}
new->bv_len = len;
if ( dup ) {
if ( (new->bv_val = ber_memalloc_x( new->bv_len+1, ctx )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
if ( !bv ) {
ber_memfree_x( new, ctx );
}
}
len = strlen( s ) + 1;
-
- if ( (p = ber_memalloc_x( len, ctx )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
- return NULL;
+ if ( (p = ber_memalloc_x( len, ctx )) != NULL ) {
+ AC_MEMCPY( p, s, len );
}
- AC_MEMCPY( p, s, len );
return p;
}
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 )
{
return NULL;
}
- len = strlen( s );
-
- if ( len > l ) {
- len = l;
- }
-
- if ( (p = ber_memalloc_x( len + 1, ctx )) == NULL ) {
- ber_errno = LBER_ERROR_MEMORY;
- return NULL;
+ len = ber_strnlen( s, l );
+ if ( (p = ber_memalloc_x( len + 1, ctx )) != NULL ) {
+ AC_MEMCPY( p, s, len );
+ p[len] = '\0';
}
- AC_MEMCPY( p, s, len );
- p[len] = '\0';
return p;
}
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<i; j++) {
+ ber_dupbv_x( &new[j], &src[j], ctx );
+ if ( BER_BVISNULL( &new[j] )) {
+ ber_bvarray_free_x( new, ctx );
+ return -1;
+ }
+ }
+ BER_BVZERO( &new[j] );
+ *dst = new;
+ return 0;
+}
+
int
ber_bvarray_add_x( BerVarray *a, BerValue *bv, void *ctx )
{
(*a)[n++] = *bv;
(*a)[n].bv_val = NULL;
+ (*a)[n].bv_len = 0;
return n;
}
projects / openldap / blobdiff