upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#5340 fixes:

Browse source 
slap_send_ldap_result() when rs->sr_flags & REP_REF_MUSTBEFREED:
- Do not return with rs->sr_ref == <freed data>, set it to NULL instead.
- Plug memory leak when op->o_domain_scope || op->o_protocol<LDAP_VERSION3.
send_ldap_response():
- Paranoia: Reset REP_MATCHED_MUSTBEFREED and REP_REF_MUSTBEFREED,
  in case the caller reuses the SlapReply without resetting the flags.
This commit is contained in:
Hallvard Furuseth 2008-04-10 12:54:11 +00:00
parent eaec3a56e4
commit 0669adf635
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
servers/slapd/result.c
View file

@ -522,14 +522,20 @@ clean2:;
(void)slap_cleanup_play( op, rs );
}
if ( rs->sr_matched && rs->sr_flags & REP_MATCHED_MUSTBEFREED ) {
free( (char *)rs->sr_matched );
rs->sr_matched = NULL;
if ( rs->sr_flags & REP_MATCHED_MUSTBEFREED ) {
rs->sr_flags ^= REP_MATCHED_MUSTBEFREED; /* paranoia */
if ( rs->sr_matched ) {
free( (char *)rs->sr_matched );
rs->sr_matched = NULL;
}
}
if ( rs->sr_ref && rs->sr_flags & REP_REF_MUSTBEFREED ) {
ber_bvarray_free( rs->sr_ref );
rs->sr_ref = NULL;
if ( rs->sr_flags & REP_REF_MUSTBEFREED ) {
rs->sr_flags ^= REP_REF_MUSTBEFREED; /* paranoia */
if ( rs->sr_ref ) {
ber_bvarray_free( rs->sr_ref );
rs->sr_ref = NULL;
}
}
return rc;
@ -625,6 +631,14 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
abandon:
if ( rs->sr_flags & REP_REF_MUSTBEFREED ) {
if ( rs->sr_ref == NULL ) {
rs->sr_flags ^= REP_REF_MUSTBEFREED;
ber_bvarray_free( oref );
}
oref = NULL; /* send_ldap_response() will free rs->sr_ref if != NULL */
}
if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
if ( op->o_tag == LDAP_REQ_SEARCH ) {
char nbuf[64];