X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmods.c;h=4be7849f2da30c4e0807915458bd6300245684f9;hb=86bd3651e1bc6129cf2bd4ba271f33207843aaff;hp=3ba189856a14dfc7a104208bc335f08b3b6581b3;hpb=854b433489096f0e69548730bbc196c281e823f6;p=openldap

diff --git a/servers/slapd/mods.c b/servers/slapd/mods.c
index 3ba189856a..4be7849f2d 100644
--- a/servers/slapd/mods.c
+++ b/servers/slapd/mods.c
@@ -90,7 +90,7 @@ modify_add_values(
 		for ( p = i = 0; !BER_BVISNULL( &mod->sm_values[i] ); i++ ) {
 			int	match;
 
-			assert( a->a_vals[0].bv_val );
+			assert( a->a_vals[0].bv_val != NULL );
 			for ( j = 0; !BER_BVISNULL( &a->a_vals[j] ); j++ ) {
 				if ( mod->sm_nvalues ) {
 					rc = ordered_value_match( &match, mod->sm_desc, mr,
@@ -245,7 +245,7 @@ modify_delete_vindex(
 			}
 
 			if( mod->sm_nvalues ) {
-				assert( a->a_nvals );
+				assert( a->a_nvals != NULL );
 				rc = ordered_value_match( &match, a->a_desc, mr,
 					SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX
 						| SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
@@ -432,14 +432,16 @@ slap_mod_free(
 
 void
 slap_mods_free(
-    Modifications	*ml )
+    Modifications	*ml,
+    int			freevals )
 {
 	Modifications *next;
 
 	for ( ; ml != NULL; ml = next ) {
 		next = ml->sml_next;
 
-		slap_mod_free( &ml->sml_mod, 0 );
+		if ( freevals )
+			slap_mod_free( &ml->sml_mod, 0 );
 		free( ml );
 	}
 }