ITS#6793

diff --git a/CHANGES b/CHANGES
index 5e96604c8ce61b5c46dd2912913f54ecaa1c53e4..cf910c12970a5fc250f0d2c498df343c0231df4b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -65,6 +65,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed slapd-ldap chaining with onelevel scope (ITS#6699)
        Fixed slapd-ldap chaining with ppolicy (ITS#6540)
        Fixed slapd-ldap with SASL/EXTERNAL (ITS#6642)
+       Fixed slapd-ldap crasher on matchedDN (ITS#6793)
        Fixed slapd-ldif error strings (ITS#6731)
        Fixed slapd-ndb to honor rootpw setting (ITS#6661)
        Fixed slapd-ndb hasSubordinates generation (ITS#6712)

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 702cde2a5d36ca107c2375fb6c01284f703b1005..e58641cff1222909c3fca85af440cbb24bd3f401 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -169,9 +169,7 @@ ldap_back_search(
        int             do_retry = 1, dont_retry = 0;
        LDAPControl     **ctrls = NULL;
        char            **references = NULL;
-
-       /* FIXME: shouldn't this be null? */
-       const char      *save_matched = rs->sr_matched;
+       void            *matchctx = NULL;
 
        if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
                return rs->sr_err;
@@ -548,12 +546,11 @@ retry:
                struct berval   pmatch;
 
                if ( dnPretty( NULL, &match, &pmatch, op->o_tmpmemctx ) == LDAP_SUCCESS ) {
-                       rs->sr_matched = pmatch.bv_val;
                        ber_memfree( match.bv_val );
-
-               } else {
-                       rs->sr_matched = match.bv_val;
+                       matchctx = op->o_tmpmemctx;
+                       match.bv_val = pmatch.bv_val;
                }
+               rs->sr_matched = match.bv_val;
        }
 
        if ( rs->sr_v2ref ) {
@@ -584,15 +581,10 @@ finish:;
                rs->sr_ctrls = NULL;
        }
 
-       if ( rs->sr_matched != NULL && rs->sr_matched != save_matched ) {
-               if ( rs->sr_matched != match.bv_val ) {
-                       ber_memfree_x( (char *)rs->sr_matched, op->o_tmpmemctx );
-
-               } else {
-                       ber_memfree( match.bv_val );
-               }
-               rs->sr_matched = save_matched;
+       if ( match.bv_val ) {
+               ber_memfree_x( match.bv_val, matchctx );
        }
+       rs->sr_matched = NULL;
 
        if ( rs->sr_text ) {
                if ( freetext ) {