don't leak if realloc fails (ITS#4477)

[openldap] / libraries / liblber / memory.c

diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c
index 97e3dff57b61f9fb24d2bdf8f9004d57398e12d5..f45ec52b68d8d6968d6e2a4d94b90d795f8cb134 100644 (file)
--- 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 <http://www.openldap.org/>.
+ *
+ * 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 #include "portable.h"
 
 #include <ac/stdlib.h>
@@ -11,9 +21,6 @@
 #include "lber-int.h"
 
 #ifdef LDAP_MEMORY_TRACE
-# ifndef LDAP_MEMORY_DEBUG
-#  define LDAP_MEMORY_DEBUG 1
-# endif
 #include <stdio.h>
 #endif
 
@@ -57,7 +64,7 @@ struct ber_mem_hdr {
 
 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 
@@ -115,8 +122,6 @@ BerMemoryFunctions *ber_int_memory_fns = NULL;
 void
 ber_memfree_x( void *p, void *ctx )
 {
-    ber_int_options.lbo_valid = LBER_INITIALIZED;
-
        if( p == NULL ) {
                return;
        }
@@ -130,11 +135,12 @@ ber_memfree_x( void *p, void *ctx )
                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,7 +151,7 @@ ber_memfree_x( void *p, void *ctx )
                return;
        }
 
-       assert( ber_int_memory_fns->bmf_free );
+       assert( ber_int_memory_fns->bmf_free != 0 );
 
        (*ber_int_memory_fns->bmf_free)( p, ctx );
 }
@@ -161,8 +167,6 @@ ber_memvfree_x( void **vec, void *ctx )
 {
        int     i;
 
-       ber_int_options.lbo_valid = LBER_INITIALIZED;
-
        if( vec == NULL ) {
                return;
        }
@@ -186,7 +190,6 @@ void *
 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 );
@@ -206,12 +209,13 @@ ber_memalloc_x( ber_len_t s, void *ctx )
                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);
@@ -242,7 +246,6 @@ void *
 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);
@@ -263,12 +266,13 @@ ber_memcalloc_x( ber_len_t n, ber_len_t s, void *ctx )
                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];
@@ -297,7 +301,6 @@ void *
 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 ) {
@@ -331,7 +334,7 @@ ber_memrealloc_x( void* p, ber_len_t s, void *ctx )
                        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);
                }
@@ -339,10 +342,11 @@ ber_memrealloc_x( void* p, ber_len_t s, void *ctx )
                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];
@@ -369,8 +373,6 @@ ber_memrealloc( void* p, ber_len_t s )
 void
 ber_bvfree_x( struct berval *bv, void *ctx )
 {
-       ber_int_options.lbo_valid = LBER_INITIALIZED;
-
        if( bv == NULL ) {
                return;
        }
@@ -395,8 +397,6 @@ ber_bvecfree_x( struct berval **bv, void *ctx )
 {
        int     i;
 
-       ber_int_options.lbo_valid = LBER_INITIALIZED;
-
        if( bv == NULL ) {
                return;
        }
@@ -426,8 +426,6 @@ 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 */
@@ -483,8 +481,6 @@ ber_dupbv_x(
 {
        struct berval *new;
 
-       ber_int_options.lbo_valid = LBER_INITIALIZED;
-
        if( src == NULL ) {
                ber_errno = LBER_ERROR_PARAM;
                return NULL;
@@ -540,8 +536,6 @@ ber_str2bv_x(
 {
        struct berval *new;
 
-       ber_int_options.lbo_valid = LBER_INITIALIZED;
-
        if( s == NULL ) {
                ber_errno = LBER_ERROR_PARAM;
                return NULL;
@@ -588,8 +582,6 @@ ber_mem2bv_x(
 {
        struct berval *new;
 
-       ber_int_options.lbo_valid = LBER_INITIALIZED;
-
        if( s == NULL ) {
                ber_errno = LBER_ERROR_PARAM;
                return NULL;
@@ -636,8 +628,6 @@ 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
@@ -670,8 +660,6 @@ 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
@@ -703,13 +691,37 @@ 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 );
+
+       if ( 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;
 
-       ber_int_options.lbo_valid = LBER_INITIALIZED;
-
        if (a) {
                BER_MEM_VALID( a );
 
@@ -736,8 +748,6 @@ 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;