Merge in latest changes from HEAD

[openldap] / servers / slapd / back-ldbm / search.c

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 4a463522085c54b6f25ace591d31aa018a643f4d..8d3949cc67a3760c5ffd2bc61c642c3f7ee999a9 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -111,6 +111,8 @@ ldbm_back_search(
 
                ber_bvarray_free( rs->sr_ref );
                ber_memfree( matched_dn.bv_val );
+               rs->sr_ref = NULL;
+               rs->sr_matched = NULL;
                return LDAP_REFERRAL;
        }
 
@@ -155,6 +157,8 @@ ldbm_back_search(
                }
 
                ber_memfree( matched_dn.bv_val );
+               rs->sr_ref = NULL;
+               rs->sr_matched = NULL;
                return LDAP_OTHER;
        }