Commit 90d2b4e2 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6629

parent 63287d79
...@@ -15,6 +15,7 @@ OpenLDAP 2.4.24 Engineering ...@@ -15,6 +15,7 @@ OpenLDAP 2.4.24 Engineering
Fixed ldapsearch segfault with deref (ITS#6638) Fixed ldapsearch segfault with deref (ITS#6638)
Fixed slapd acl parsing overflow (ITS#6611) Fixed slapd acl parsing overflow (ITS#6611)
Fixed slapd config leak with olcDbDirectory (ITS#6634) Fixed slapd config leak with olcDbDirectory (ITS#6634)
Fixed slapd to free controls if needed (ITS#6629)
Fixed slapd filter leak (ITS#6635) Fixed slapd filter leak (ITS#6635)
Fixed slapd when first acl is value dependent (ITS#6693) Fixed slapd when first acl is value dependent (ITS#6693)
Fixed slapd modify to return actual error (ITS#6581) Fixed slapd modify to return actual error (ITS#6581)
......
...@@ -1356,6 +1356,14 @@ error_return:; ...@@ -1356,6 +1356,14 @@ error_return:;
rs->sr_flags &= ~REP_ENTRY_MUSTBEFREED; rs->sr_flags &= ~REP_ENTRY_MUSTBEFREED;
} }
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 );
rs->sr_ctrls = NULL;
}
}
return( rc ); return( rc );
} }
...@@ -1510,6 +1518,14 @@ rel: ...@@ -1510,6 +1518,14 @@ rel:
(void)slap_cleanup_play( op, rs ); (void)slap_cleanup_play( op, rs );
} }
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 );
rs->sr_ctrls = NULL;
}
}
return rc; return rc;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment