Fixed back-meta freeit bug (ITS#3190)

diff --git a/CHANGES b/CHANGES
index d317ffb6f2c1fd7f46d3836b027daf55bdb8db00..19d523f25db122b604ccfe6effba9d07477b29a3 100644 (file)
--- 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 a1002c92c51e30a4d770fb8c68a600e726a88936..1a2bf3d85d4e36ffd40ad9ec57778f8499cd4f57 100644 (file)
--- 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 );