From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 22 Mar 2007 22:31:18 +0000 (+0000)
Subject: fix test in case of bailout (ITS#4891)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_35~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f94d411f5eef7e880255b1c7ba813801db419a60;p=thirdparty%2Fopenldap.git

fix test in case of bailout (ITS#4891)
---

diff --git a/CHANGES b/CHANGES
index a52ea58741..2fddebba7f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.3.35 Engineering
 	Fixed slapd-meta search cleanup
 	Fixed slapd-meta/slapo-rwm filter mapping
 	Fixed slapd-sql subtree shortcut (ITS#4856)
+	Fixed slapo-dynlist crasher (ITS#4891)
 	Fixed slapo-refint config message (ITS#4853)
 	Fixed libldap time_t signedness (ITS#4872)
 	Fixed libldap_r tpool reset (ITS#4855)
diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 239cc7e059..f99e00ebd0 100644
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -480,7 +480,8 @@ cleanup:;
 		if ( !BER_BVISNULL( &o.o_req_ndn ) ) {
 			op->o_tmpfree( o.o_req_ndn.bv_val, op->o_tmpmemctx );
 		}
-		assert( o.ors_filterstr.bv_val != lud->lud_filter );
+		assert( BER_BVISNULL( &o.ors_filterstr )
+			|| o.ors_filterstr.bv_val != lud->lud_filter );
 		op->o_tmpfree( o.ors_filterstr.bv_val, op->o_tmpmemctx );
 		ldap_free_urldesc( lud );
 	}