From: Howard Chu <hyc@openldap.org>
Date: Wed, 22 Oct 2003 10:35:49 +0000 (+0000)
Subject: Fix dnPrettyNormalize mem usage
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~514
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=942320dca1a75f0ed865253cbae6bd49d3b1988d;p=openldap

Fix dnPrettyNormalize mem usage
---

diff --git a/servers/slapd/back-meta/cache-merge.c b/servers/slapd/back-meta/cache-merge.c
index a9592d43d1..e6472730ef 100644
--- a/servers/slapd/back-meta/cache-merge.c
+++ b/servers/slapd/back-meta/cache-merge.c
@@ -120,7 +120,14 @@ merge_entry(
 	sreply.sr_nentries = 0; 
 
 	e = ( Entry * ) ch_calloc( 1, sizeof( Entry )); 
-	dnPrettyNormal(0, &rs->sr_entry->e_name, &e->e_name, &e->e_nname, op->o_tmpmemctx);
+
+	dnPrettyNormal(0, &rs->sr_entry->e_name, &op_tmp.o_req_dn, &op_tmp.o_req_ndn, op->o_tmpmemctx);
+	ber_dupbv( &e->e_name, &op_tmp.o_req_dn );
+	ber_dupbv( &e->e_nname, &op_tmp.o_req_ndn );
+	sl_free( op_tmp.o_req_ndn.bv_val, op->o_tmpmemctx );
+	sl_free( op_tmp.o_req_dn.bv_val, op->o_tmpmemctx );
+	op_tmp.o_req_dn = e->e_name;
+	op_tmp.o_req_ndn = e->e_nname;
 
 	e->e_private = NULL;
 	e->e_attrs = NULL; 
@@ -163,8 +170,6 @@ merge_entry(
 	op_tmp.o_do_not_cache = 1;
 
 	op_tmp.ora_e = e;
-	op_tmp.o_req_dn = e->e_name;
-	op_tmp.o_req_ndn = e->e_nname;
 	rc = op->o_bd->be_add( &op_tmp, &sreply );
 
 	if ( rc != LDAP_SUCCESS ) {