ITS#6635

diff --git a/CHANGES b/CHANGES
index ed08ed8ecc36625e23321f7d7f1745962e3a6723..d99ed0c1b5965e590d5fbc67b4845425837044e7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed liblutil getpass prompts (ITS#6702)
        Fixed ldapsearch segfault with deref (ITS#6638)
        Fixed slapd acl parsing overflow (ITS#6611)
+       Fixed slapd filter leak (ITS#6635)
        Fixed slapd when first acl is value dependent (ITS#6693)
        Fixed slapd modify to return actual error (ITS#6581)
        Fixed slapd sortvals of attributes with 1 value (ITS#6715)

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index ff8efa6a2a2a21909b9bcd1372f0f60379631b61..a1d6411731bf7b11c62582948d1cc23cfd9dc4b9 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -521,6 +521,8 @@ filter_free_x( Operation *op, Filter *f, int freeme )
 
        switch ( f->f_choice ) {
        case LDAP_FILTER_PRESENT:
+               if ( f->f_desc->ad_flags & SLAP_DESC_TEMPORARY )
+                       op->o_tmpfree( f->f_desc, op->o_tmpmemctx );
                break;
 
        case LDAP_FILTER_EQUALITY: