Merge remote-tracking branch 'origin/mdb.master'

[openldap] / libraries / liblber / memory.c

diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c
index 94ef772d97dbe169807c261b6840bcd9dcf23216..4c510372d83b126bca33e4ae2c8717bafa28356d 100644 (file)
--- a/libraries/liblber/memory.c
+++ b/libraries/liblber/memory.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,9 +62,9 @@ struct ber_mem_hdr {
 };
 
 /* 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,
@@ -201,9 +201,10 @@ ber_memalloc_x( ber_len_t s, void *ctx )
 
        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);
@@ -222,6 +223,7 @@ ber_memalloc_x( ber_len_t s, void *ctx )
 
                BER_MEM_VALID( &mh[1] );
                new = &mh[1];
+               }
 #else
                new = malloc( s );
 #endif
@@ -254,9 +256,12 @@ ber_memcalloc_x( ber_len_t n, ber_len_t s, void *ctx )
 
        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;
@@ -273,6 +278,7 @@ ber_memcalloc_x( ber_len_t n, ber_len_t s, void *ctx )
 #endif
                BER_MEM_VALID( &mh[1] );
                new = &mh[1];
+               }
 #else
                new = calloc( n, s );
 #endif
@@ -487,7 +493,6 @@ ber_dupbv_x(
                new = dst;
        } else {
                if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
-                       ber_errno = LBER_ERROR_MEMORY;
                        return NULL;
                }
        }
@@ -499,7 +504,6 @@ ber_dupbv_x(
        }
 
        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;
@@ -542,7 +546,6 @@ ber_str2bv_x(
                new = bv;
        } else {
                if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
-                       ber_errno = LBER_ERROR_MEMORY;
                        return NULL;
                }
        }
@@ -550,7 +553,6 @@ ber_str2bv_x(
        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;
@@ -588,7 +590,6 @@ ber_mem2bv_x(
                new = bv;
        } else {
                if(( new = ber_memalloc_x( sizeof(struct berval), ctx )) == NULL ) {
-                       ber_errno = LBER_ERROR_MEMORY;
                        return NULL;
                }
        }
@@ -596,7 +597,6 @@ ber_mem2bv_x(
        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 );
                        }
@@ -635,13 +635,10 @@ ber_strdup_x( LDAP_CONST char *s, void *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;
 }
 
@@ -651,6 +648,16 @@ 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 )
 {
@@ -666,19 +673,12 @@ 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;
 }