From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 21 Feb 2007 22:32:21 +0000 (+0000)
Subject: import more consistent sanity assertion
X-Git-Tag: OPENLDAP_REL_ENG_2_3_35~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d70f9fc99d3c1dcaff1c422fda475a3caa64302;p=thirdparty%2Fopenldap.git

import more consistent sanity assertion
---

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 7377b11b8c..12fffedf58 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -208,7 +208,9 @@ attr_merge(
 		 * of nvals and the value of (*a)->a_nvals must be consistent
 		 */
 		assert( ( nvals == NULL && (*a)->a_nvals == (*a)->a_vals )
-				|| ( nvals != NULL && (*a)->a_nvals != (*a)->a_vals ) );
+				|| ( nvals != NULL && (
+					( (*a)->a_vals == NULL && (*a)->a_nvals == NULL )
+					|| ( (*a)->a_nvals != (*a)->a_vals ) ) ) );
 	}
 
 	rc = value_add( &(*a)->a_vals, vals );