From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 23 Aug 2005 23:56:47 +0000 (+0000)
Subject: make sure a_nvals are as many as a_vals (helps tracking other issues...)
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~596
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c33124e6982fb02884d2d7c5118327a4077c6d71;p=openldap

make sure a_nvals are as many as a_vals (helps tracking other issues...)
---

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index d0738ed01a..5b9a5bba0f 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -111,7 +111,7 @@ attr_dup( Attribute *a )
 	tmp = attr_alloc( a->a_desc );
 
 	if ( a->a_vals != NULL ) {
-		int i;
+		int	i;
 
 		for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ ) {
 			/* EMPTY */ ;
@@ -129,13 +129,17 @@ attr_dup( Attribute *a )
 		assert( a->a_nvals != NULL );
 
 		if ( a->a_nvals != a->a_vals ) {
+			int	j;
+
 			tmp->a_nvals = ch_malloc( (i + 1) * sizeof(struct berval) );
-			for ( i = 0; !BER_BVISNULL( &a->a_nvals[i] ); i++ ) {
-				ber_dupbv( &tmp->a_nvals[i], &a->a_nvals[i] );
-				if ( BER_BVISNULL( &tmp->a_nvals[i] ) ) break;
+			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? */
 			}
-			BER_BVZERO( &tmp->a_nvals[i] );
+			assert( j == i );
+			BER_BVZERO( &tmp->a_nvals[j] );
 
 		} else {
 			tmp->a_nvals = tmp->a_vals;