X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fvalue.c;h=c3c0b0d47257a1044244ad77e05cc5d6e448ed9e;hb=3d9377f76404965d483c210a95e4e55386ff98a3;hp=bc139e2f8e649f82fa31e99c8d94c892e5560555;hpb=185ff129b59340698f32e9e8ecf26c21fb58b446;p=openldap

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index bc139e2f8e..c3c0b0d472 100644
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -1,7 +1,7 @@
 /* value.c - routines for dealing with values */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -20,32 +20,35 @@
 
 int
 value_add( 
-    struct berval	***vals,
-    struct berval	**addvals
+    BerVarray *vals,
+    BerVarray addvals
 )
 {
-	int	n, nn, i, j;
+	int	n, nn;
+	BerVarray v2;
 
-	for ( nn = 0; addvals != NULL && addvals[nn] != NULL; nn++ )
+	for ( nn = 0; addvals != NULL && addvals[nn].bv_val != NULL; nn++ )
 		;	/* NULL */
 
 	if ( *vals == NULL ) {
-		*vals = (struct berval **) ch_malloc( (nn + 1)
-		    * sizeof(struct berval *) );
+		*vals = (BerVarray) ch_malloc( (nn + 1)
+		    * sizeof(struct berval) );
 		n = 0;
-
 	} else {
-		for ( n = 0; (*vals)[n] != NULL; n++ )
-			;	/* NULL */
-		*vals = (struct berval **) ch_realloc( (char *) *vals,
-		    (n + nn + 1) * sizeof(struct berval *) );
+		for ( n = 0; (*vals)[n].bv_val != NULL; n++ ) {
+			;	/* Empty */
+		}
+		*vals = (BerVarray) ch_realloc( (char *) *vals,
+		    (n + nn + 1) * sizeof(struct berval) );
 	}
 
-	for ( i = 0, j = 0; i < nn; i++ ) {
-		(*vals)[n + j] = ber_bvdup( addvals[i] );
-		if( (*vals)[n + j++] == NULL ) break;
+	v2 = *vals + n;
+	for ( ; addvals->bv_val; v2++, addvals++ ) {
+		ber_dupbv(v2, addvals);
+		if (v2->bv_val == NULL) break;
 	}
-	(*vals)[n + j] = NULL;
+	v2->bv_val = NULL;
+	v2->bv_len = 0;
 
 	return LDAP_SUCCESS;
 }
@@ -131,8 +134,8 @@ value_match(
 	const char ** text )
 {
 	int rc;
-	struct berval nv1;
-	struct berval nv2;
+	struct berval nv1 = { 0, NULL };
+	struct berval nv2 = { 0, NULL };
 
 	if( !mr->smr_match ) {
 		return LDAP_INAPPROPRIATE_MATCHING;
@@ -165,8 +168,8 @@ value_match(
 		nv1.bv_val != NULL ? &nv1 : v1,
 		nv2.bv_val != NULL ? &nv2 : v2 );
 	
-	free( nv1.bv_val );
-	free( nv2.bv_val );
+	if (nv1.bv_val ) free( nv1.bv_val );
+	if (nv2.bv_val ) free( nv2.bv_val );
 	return rc;
 }
 
@@ -174,12 +177,12 @@ value_match(
 int value_find_ex(
 	AttributeDescription *ad,
 	unsigned flags,
-	struct berval **vals,
+	BerVarray vals,
 	struct berval *val )
 {
 	int	i;
 	int rc;
-	struct berval nval;
+	struct berval nval = { 0, NULL };
 	struct berval nval_tmp;
 	MatchingRule *mr = ad->ad_type->sat_equality;
 
@@ -212,12 +215,12 @@ int value_find_ex(
 		}
 	}
 
-	for ( i = 0; vals[i] != NULL; i++ ) {
+	for ( i = 0; vals[i].bv_val != NULL; i++ ) {
 		int match;
 		const char *text;
 
 		rc = value_match( &match, ad, mr, flags,
-			vals[i], nval.bv_val == NULL ? val : &nval, &text );
+			&vals[i], nval.bv_val == NULL ? val : &nval, &text );
 
 		if( rc == LDAP_SUCCESS && match == 0 ) {
 			free( nval.bv_val );