From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 27 Sep 2004 22:08:03 +0000 (+0000)
Subject: fix ITS#3346
X-Git-Tag: OPENLDAP_REL_ENG_2_2_18~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3991e677b83f991cea6e8cf4682a1072b990980c;p=openldap

fix ITS#3346
---

diff --git a/CHANGES b/CHANGES
index bfa4576241..0dbfd798e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.2.18 Engineering
 	Fixed slapd matching rule name sensitivity
 	Fixed slapd referral memory leak
 	Fixed slapd mods2entry memory leak
+	Fixed slapd multiple value delete (ITS#3346)
 	Updated back-sql
 
 OpenLDAP 2.2.17 Release
diff --git a/servers/slapd/mods.c b/servers/slapd/mods.c
index bda5738a47..00ae400788 100644
--- a/servers/slapd/mods.c
+++ b/servers/slapd/mods.c
@@ -219,9 +219,13 @@ modify_delete_values(
 		return LDAP_NO_SUCH_ATTRIBUTE;
 	}
 
-	for ( i = 0; mod->sm_values[i].bv_val != NULL; i++ ) {
+	for ( i = 0; !BER_BVISNULL( &mod->sm_values[i] ); i++ ) {
 		int	found = 0;
-		for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+		for ( j = 0; !BER_BVISNULL( &a->a_vals[j] ); j++ ) {
+			/* skip already deleted values */
+			if ( a->a_vals[j].bv_val == &dummy ) {
+				continue;
+			}
 
 			if( mod->sm_nvalues ) {
 				assert( a->a_nvals );