Merge in latest changes from HEAD

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

diff --git a/servers/slapd/back-ldbm/referral.c b/servers/slapd/back-ldbm/referral.c
index 6aedb91e5f294a2ebd11b881e98dd0ce50c28b0d..fc14eb993c51bb9aa223866cdc3ed62ecc8d3aa9 100644 (file)
--- a/servers/slapd/back-ldbm/referral.c
+++ b/servers/slapd/back-ldbm/referral.c
@@ -79,6 +79,8 @@ ldbm_back_referrals(
                }
 
                if ( rs->sr_matched ) free( (char *)rs->sr_matched );
+               rs->sr_ref = NULL;
+               rs->sr_matched = NULL;
                return rs->sr_err;
        }
 
@@ -111,6 +113,8 @@ ldbm_back_referrals(
                }
 
                if( refs != NULL ) ber_bvarray_free( refs );
+               rs->sr_ref = NULL;
+               rs->sr_matched = NULL;
        }
 
        cache_return_entry_r( &li->li_cache, e );