From: Howard Chu <hyc@openldap.org>
Date: Thu, 16 Jun 2022 20:32:07 +0000 (+0100)
Subject: ITS#9866 delta-sync: fix DN leak on Adds
X-Git-Tag: OPENLDAP_REL_ENG_2_5_13~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50a65a73e37db00cf29e9d75c966e9137e991ae7;p=thirdparty%2Fopenldap.git

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

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 6ed5580177..52e67e48fa 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -3107,10 +3107,8 @@ syncrepl_message_to_op(
 				ch_free( bvals );
 				goto done;
 			}
-			ber_dupbv( &op->o_req_dn, &dn );
-			ber_dupbv( &op->o_req_ndn, &ndn );
-			slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
-			slap_sl_free( dn.bv_val, op->o_tmpmemctx );
+			op->o_req_dn = dn;
+			op->o_req_ndn = ndn;
 			freeReqDn = 1;
 		} else if ( !ber_bvstrcasecmp( &bv, &ls->ls_req ) ) {
 			int i = verb_to_mask( bvals[0].bv_val, modops );
@@ -3220,9 +3218,8 @@ syncrepl_message_to_op(
 		if ( op->o_tag == LDAP_REQ_ADD ) {
 			Entry *e = entry_alloc();
 			op->ora_e = e;
-			op->ora_e->e_name = op->o_req_dn;
-			op->ora_e->e_nname = op->o_req_ndn;
-			freeReqDn = 0;
+			ber_dupbv( &op->ora_e->e_name, &op->o_req_dn );
+			ber_dupbv( &op->ora_e->e_nname, &op->o_req_ndn );
 			rc = slap_mods2entry( modlist, &op->ora_e, 1, 0, &text, txtbuf, textlen);
 			if( rc != LDAP_SUCCESS ) {
 				Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_op: %s "
@@ -3353,8 +3350,8 @@ done:
 		}
 	}
 	if ( freeReqDn ) {
-		ch_free( op->o_req_ndn.bv_val );
-		ch_free( op->o_req_dn.bv_val );
+		op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+		op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
 	}
 	ber_free( ber, 0 );
 	return rc;