From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 11 Jan 2007 23:32:04 +0000 (+0000)
Subject: import fix to ITS#4801
X-Git-Tag: OPENLDAP_REL_ENG_2_3_33~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b48bf9f25b5d01f437a1639897870e8a185b4055;p=thirdparty%2Fopenldap.git

import fix to ITS#4801
---

diff --git a/CHANGES b/CHANGES
index 62a335ede8..a2a05ff007 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ OpenLDAP 2.3.33 Engineering
 	Fixed slapd-ldap/meta privileged connections handling (ITS#4791)
 	Fixed slapd-meta retrying (ITS#4594, 4762)
 	Fixed slapo-chain referral DN use (ITS#4776)
+	Fixed slapo-dynlist dangling pointer after entry free (ITS#4801)
 	Fixed libldap ldap_pvt_put_filter syntax checks (ITS#4648)
 	Documentation
 		Fixed reference to deprecated stmt in slapacl(8) (ITS#4803)
diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 100afb1b40..239cc7e059 100644
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -289,6 +289,8 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
 done:;
 	if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
 		entry_free( rs->sr_entry );
+		rs->sr_entry = NULL;
+		rs->sr_flags ^= REP_ENTRY_MUSTBEFREED;
 	}
 
 	return 0;