From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 17 Jun 2004 18:38:54 +0000 (+0000)
Subject: Fixed back-meta freeit bug (ITS#3190)
X-Git-Tag: OPENLDAP_REL_ENG_2_2_14~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4b10bf617a9d94c91725f013124ebf6159d83807;p=openldap

Fixed back-meta freeit bug (ITS#3190)
---

diff --git a/CHANGES b/CHANGES
index d317ffb6f2..19d523f25d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.2.14 Engineering
 	Fixed back-bdb pagedResults clear controls bug (ITS#3182)
 	Fixed back-bdb pagedResults ignore control bug
 	Fixed back-hdb empty suffix bugs (ITS#3063,3186)
+	Fixed back-meta freeit bug (ITS#3190)
 	Fixed slapi prototypes bug (ITS#3166)
 	Fixed slapi internal search limit bugs (ITS#3183)
 	Added slapd -l USER/DAEMON options (ITS#3187)
diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index a1002c92c5..1a2bf3d85d 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -388,6 +388,7 @@ new_candidate:;
 
 				rc = ldap_parse_reference( lsc->ld, res,
 						&references, &rs->sr_ctrls, 1 );
+				res = NULL;
 
 				if ( rc != LDAP_SUCCESS ) {
 					continue;
@@ -422,9 +423,6 @@ new_candidate:;
 					rs->sr_ctrls = NULL;
 				}
 
-				ldap_msgfree( res );
-				res = NULL;
-
 			} else {
 				rs->sr_err = ldap_result2error( lsc->ld,
 						res, 1 );