Import ITS#1398 fix from HEAD

diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c
index 90720fa792557b79620fb69f4e7f301f8ffbb133..7b1057a6c248e6d3be7d0ee79d434ce66875697e 100644 (file)
--- a/libraries/liblber/memory.c
+++ b/libraries/liblber/memory.c
@@ -401,7 +401,7 @@ ber_bvecadd( struct berval ***bvec, struct berval *bv )
 
        ber_int_options.lbo_valid = LBER_INITIALIZED;
 
-       if( bvec == NULL ) {
+       if( *bvec == NULL ) {
                if( bv == NULL ) {
                        /* nothing to add */
                        return 0;
@@ -422,7 +422,7 @@ ber_bvecadd( struct berval ***bvec, struct berval *bv )
        BER_MEM_VALID( bvec );
 
        /* count entries */
-       for ( i = 0; bvec[i] != NULL; i++ ) {
+       for ( i = 0; (*bvec)[i] != NULL; i++ ) {
                /* EMPTY */;
        }