From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 15 Jul 2005 01:14:13 +0000 (+0000)
Subject: actually, fixed leak is unrelated to ITS#3862
X-Git-Tag: OPENLDAP_REL_ENG_2_2_28~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e977068ed95d5af4d16443c001ae55c91a3d883;p=thirdparty%2Fopenldap.git

actually, fixed leak is unrelated to ITS#3862
---

diff --git a/CHANGES b/CHANGES
index 2945ff5cb2..4c2d559887 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,7 @@ OpenLDAP 2.2.28 Engineering
 	Fixed back-bdb/hdb - check for BDB TXN patch
 	Fixed back-hdb nested modrdn bug (ITS#3857)
 	Fixed back-ldap/meta undefined filter propagation (ITS#3785)
-	Fixed back-ldap/meta memory leak (ITS#3862)
+	Fixed back-ldap/meta rewrite session memory leak
 	Fixed back-meta add w/o parent add (ITS#3804)
 	Fixed back-meta control propagation bug (ITS#3813)
 	Fixed syncrepl SASL bind crash (ITS#3792)
diff --git a/servers/slapd/back-meta/unbind.c b/servers/slapd/back-meta/unbind.c
index 8f2839a0e0..de5ed44d24 100644
--- a/servers/slapd/back-meta/unbind.c
+++ b/servers/slapd/back-meta/unbind.c
@@ -58,13 +58,6 @@ meta_back_conn_destroy(
 			meta_back_conn_cmp );
 	ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
 
-	/*
-	 * Cleanup rewrite session
-	 */
-	for ( i = 0; i < li->ntargets; ++i ) {
-		rewrite_session_delete( li->targets[ i ]->rwmap.rwm_rw, conn );
-	}
-
 	if ( lc ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( BACK_META, INFO,
@@ -91,6 +84,13 @@ meta_back_conn_destroy(
 		free( lc );
 	}
 
+	/*
+	 * Cleanup rewrite session
+	 */
+	for ( i = 0; i < li->ntargets; ++i ) {
+		rewrite_session_delete( li->targets[ i ]->rwmap.rwm_rw, conn );
+	}
+
 	/* no response to unbind */
 
 	return 0;