From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 18 Jul 2005 21:35:32 +0000 (+0000)
Subject: import ITS#3862 fix
X-Git-Tag: OPENLDAP_REL_ENG_2_2_28~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=960a17e120d967ce3573936a77a8d54a0da2bec1;p=thirdparty%2Fopenldap.git

import ITS#3862 fix
---

diff --git a/CHANGES b/CHANGES
index 4c2d559887..c209ffd572 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.2.28 Engineering
 	Fixed back-hdb nested modrdn bug (ITS#3857)
 	Fixed back-ldap/meta undefined filter propagation (ITS#3785)
 	Fixed back-ldap/meta rewrite session memory leak
+	Fixed back-ldap abandon leak (ITS#3862)
 	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-ldap/search.c b/servers/slapd/back-ldap/search.c
index b90002e905..2c9375e961 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -182,6 +182,9 @@ fail:;
 	{
 		/* check for abandon */
 		if ( op->o_abandon ) {
+			if ( rc > 0 ) {
+				ldap_msgfree( res );
+			}
 			ldap_abandon( lc->ld, msgid );
 			rc = 0;
 			goto finish;