From: Howard Chu <hyc@openldap.org>
Date: Wed, 15 Feb 2012 01:29:14 +0000 (-0800)
Subject: ITS#7143 fix attr_dup2 when no values are present (attrsOnly = TRUE)
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=463c1fa25d45e393dc1f1ea235286f79e872fad0;p=openldap

ITS#7143 fix attr_dup2 when no values are present (attrsOnly = TRUE)
---

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 9fec8955dd..f2f74effc1 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -232,13 +232,16 @@ attr_dup2( Attribute *tmp, Attribute *a )
 		if ( a->a_nvals != a->a_vals ) {
 
 			tmp->a_nvals = ch_malloc( (tmp->a_numvals + 1) * sizeof(struct berval) );
-			for ( j = 0; !BER_BVISNULL( &a->a_nvals[j] ); j++ ) {
-				assert( j < i );
-				ber_dupbv( &tmp->a_nvals[j], &a->a_nvals[j] );
-				if ( BER_BVISNULL( &tmp->a_nvals[j] ) ) break;
-				/* FIXME: error? */
+			j = 0;
+			if ( i ) {
+				for ( ; !BER_BVISNULL( &a->a_nvals[j] ); j++ ) {
+					assert( j < i );
+					ber_dupbv( &tmp->a_nvals[j], &a->a_nvals[j] );
+					if ( BER_BVISNULL( &tmp->a_nvals[j] ) ) break;
+					/* FIXME: error? */
+				}
+				assert( j == i );
 			}
-			assert( j == i );
 			BER_BVZERO( &tmp->a_nvals[j] );
 
 		} else {