From: Howard Chu <hyc@openldap.org>
Date: Sat, 6 Sep 2008 02:11:26 +0000 (+0000)
Subject: ITS#5687 more cleanup fixes
X-Git-Tag: ACLCHECK_0~1376
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fe6f3683fa3b4c2e20bbd362a3c7d16adb517f52;p=openldap

ITS#5687 more cleanup fixes
---

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 3e515481ee..6213cff9ae 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -59,13 +59,16 @@ rwm_op_cleanup( Operation *op, SlapReply *rs )
 		op->o_req_ndn = ros->ro_ndn;
 
 		if ( !BER_BVISNULL( &ros->r_dn )
-			&& ros->r_dn.bv_val != ros->r_ndn.bv_val )
+			&& ros->r_dn.bv_val != ros->r_ndn.bv_val
+			&& ros->r_dn.bv_val != ros->ro_dn.bv_val )
 		{
 			ch_free( ros->r_dn.bv_val );
 			BER_BVZERO( &ros->r_dn );
 		}
 
-		if ( !BER_BVISNULL( &ros->r_ndn ) ) {
+		if ( !BER_BVISNULL( &ros->r_ndn )
+			&& ros->r_ndn.bv_val != ros->ro_ndn.bv_val )
+		{
 			ch_free( ros->r_ndn.bv_val );
 			BER_BVZERO( &ros->r_ndn );
 		}