import fix to ITS#4801

diff --git a/CHANGES b/CHANGES
index 62a335ede8ae9ae4ff6f3e4228054649b806110a..a2a05ff00710091b399036a3e088b2e7a27df40f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ OpenLDAP 2.3.33 Engineering
        Fixed slapd-ldap/meta privileged connections handling (ITS#4791)
        Fixed slapd-meta retrying (ITS#4594, 4762)
        Fixed slapo-chain referral DN use (ITS#4776)
+       Fixed slapo-dynlist dangling pointer after entry free (ITS#4801)
        Fixed libldap ldap_pvt_put_filter syntax checks (ITS#4648)
        Documentation
                Fixed reference to deprecated stmt in slapacl(8) (ITS#4803)

diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 100afb1b402a1572cccab194e6e41d8367650a21..239cc7e05974bbe7bff1fbaf525f16a56bd278e7 100644 (file)
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -289,6 +289,8 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
 done:;
        if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
                entry_free( rs->sr_entry );
+               rs->sr_entry = NULL;
+               rs->sr_flags ^= REP_ENTRY_MUSTBEFREED;
        }
 
        return 0;