ITS#7292 plug memleak in control values

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 54447b830b397763c3779b30750dfde84058da4f..dd2d43d4e5630f5d18052d300d5c3c2bf2e48ef6 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -566,11 +566,24 @@ void slap_free_ctrls(
        int i;
 
        for (i=0; ctrls[i]; i++) {
-               op->o_tmpfree(ctrls[i], op->o_tmpmemctx );
+               op->o_tmpfree( ctrls[i], op->o_tmpmemctx );
        }
        op->o_tmpfree( ctrls, op->o_tmpmemctx );
 }
 
+void slap_free_ctrl_vals(
+       Operation *op,
+       LDAPControl **ctrls )
+{
+       int i;
+
+       for (i=0; ctrls[i]; i++) {
+               if ( ctrls[i]->ldctl_value.bv_val )
+                       op->o_tmpfree( ctrls[i]->ldctl_value.bv_val, op->o_tmpmemctx );
+       }
+       slap_free_ctrls( op, ctrls );
+}
+
 int slap_add_ctrls(
        Operation *op,
        SlapReply *rs,

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index f0285067a88c39667ca5644048cb8682f1aba057..3fa828c8a5c6f79e12218bfa615e4c678e71d874 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -638,6 +638,9 @@ LDAP_SLAPD_V( struct slap_control_ids ) slap_cids;
 LDAP_SLAPD_F (void) slap_free_ctrls LDAP_P((
        Operation *op,
        LDAPControl **ctrls ));
+LDAP_SLAPD_F (void) slap_free_ctrl_vals LDAP_P((
+       Operation *op,
+       LDAPControl **ctrls ));
 LDAP_SLAPD_F (int) slap_add_ctrls LDAP_P((
        Operation *op,
        SlapReply *rs,

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index f42985f7cd758824cdd5c30451a1d1e596706664..0f1dca9f0aba2471d56972b7da31795ac39e7b3e 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -752,7 +752,7 @@ clean2:;
        if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) {
                rs->sr_flags ^= REP_CTRLS_MUSTBEFREED; /* paranoia */
                if ( rs->sr_ctrls ) {
-                       slap_free_ctrls( op, rs->sr_ctrls );
+                       slap_free_ctrl_vals( op, rs->sr_ctrls );
                        rs->sr_ctrls = NULL;
                }
        }
@@ -1476,7 +1476,7 @@ error_return:;
        if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) {
                rs->sr_flags ^= REP_CTRLS_MUSTBEFREED; /* paranoia */
                if ( rs->sr_ctrls ) {
-                       slap_free_ctrls( op, rs->sr_ctrls );
+                       slap_free_ctrl_vals( op, rs->sr_ctrls );
                        rs->sr_ctrls = NULL;
                }
        }
@@ -1637,7 +1637,7 @@ rel:
        if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) {
                rs->sr_flags ^= REP_CTRLS_MUSTBEFREED; /* paranoia */
                if ( rs->sr_ctrls ) {
-                       slap_free_ctrls( op, rs->sr_ctrls );
+                       slap_free_ctrl_vals( op, rs->sr_ctrls );
                        rs->sr_ctrls = NULL;
                }
        }