Fix memory leaks from ITS#6310 (logged as ITS#6387)

[openldap] / servers / slapd / filterentry.c

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index aff8da2cc4c3bf73a6863ddfb8bdaffe2b2b246c..82a36c33d2b8adb531807049d546384a184c5de7 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -169,7 +169,7 @@ static int test_mra_filter(
 
        if ( op == NULL ) {
                memctx = NULL;
-               memfree = slap_sl_free;
+               memfree = slap_sl_mfuncs.bmf_free;
        } else {
                memctx = op->o_tmpmemctx;
                memfree = op->o_tmpfree;
@@ -546,7 +546,7 @@ test_ava_filter(
        if ( ava->aa_desc == slap_schema.si_ad_hasSubordinates 
                && op && op->o_bd && op->o_bd->be_has_subordinates )
        {
-               int     hasSubordinates;
+               int     hasSubordinates = 0;
                struct berval hs;
 
                if( type != LDAP_FILTER_EQUALITY &&