upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 07:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9866 delta-sync: fix DN leak on Adds

Browse source
This commit is contained in:
Howard Chu 2022-06-16 21:32:07 +01:00
parent c076859e08
commit 14972a7ae1
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
servers/slapd/syncrepl.c
View file

@ -3114,10 +3114,8 @@ syncrepl_message_to_op(
ch_free( bvals ); ch_free( bvals );
goto done; goto done;
} }
ber_dupbv( &op->o_req_dn, &dn ); op->o_req_dn = dn;
ber_dupbv( &op->o_req_ndn, &ndn ); op->o_req_ndn = ndn;
slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
slap_sl_free( dn.bv_val, op->o_tmpmemctx );
freeReqDn = 1; freeReqDn = 1;
} else if ( !ber_bvstrcasecmp( &bv, &ls->ls_req ) ) { } else if ( !ber_bvstrcasecmp( &bv, &ls->ls_req ) ) {
int i = verb_to_mask( bvals[0].bv_val, modops ); int i = verb_to_mask( bvals[0].bv_val, modops );
@ -3227,9 +3225,8 @@ syncrepl_message_to_op(
if ( op->o_tag == LDAP_REQ_ADD ) { if ( op->o_tag == LDAP_REQ_ADD ) {
Entry *e = entry_alloc(); Entry *e = entry_alloc();
op->ora_e = e; op->ora_e = e;
op->ora_e->e_name = op->o_req_dn; ber_dupbv( &op->ora_e->e_name, &op->o_req_dn );
op->ora_e->e_nname = op->o_req_ndn; ber_dupbv( &op->ora_e->e_nname, &op->o_req_ndn );
freeReqDn = 0;
rc = slap_mods2entry( modlist, &op->ora_e, 1, 0, &text, txtbuf, textlen); rc = slap_mods2entry( modlist, &op->ora_e, 1, 0, &text, txtbuf, textlen);
if( rc != LDAP_SUCCESS ) { if( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_op: %s " Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_op: %s "
@ -3373,8 +3370,8 @@ done:
op->o_tmpfree( op->orr_nnewDN.bv_val, op->o_tmpmemctx ); op->o_tmpfree( op->orr_nnewDN.bv_val, op->o_tmpmemctx );
} }
if ( freeReqDn ) { if ( freeReqDn ) {
ch_free( op->o_req_ndn.bv_val ); op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
ch_free( op->o_req_dn.bv_val ); op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
} }
ber_free( ber, 0 ); ber_free( ber, 0 );
return rc; return rc;