From: Luke Howard <lukeh@openldap.org>
Date: Sat, 24 Dec 2005 09:20:06 +0000 (+0000)
Subject: Fix crasher in slapi_over_unmerge_controls() (if called from cleanup handler
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~509
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c723a77e1c5de6e1b93c08bd64522b415399ae7a;p=openldap

Fix crasher in slapi_over_unmerge_controls() (if called from cleanup handler
where merge controls was not called)
---

diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index 48c6d9bc14..80179429f8 100644
--- a/servers/slapd/slapi/slapi_overlay.c
+++ b/servers/slapd/slapi/slapi_overlay.c
@@ -478,7 +478,7 @@ slapi_over_unmerge_controls( Operation *op, SlapReply *rs )
 
 	slapi_pblock_get( pb, SLAPI_X_OLD_RESCONTROLS, (void **)&rs_ctrls );
 
-	if ( rs->sr_ctrls == NULL || rs->sr_ctrls == rs_ctrls ) {
+	if ( rs_ctrls == NULL || rs->sr_ctrls == rs_ctrls ) {
 		/* no copying done */
 		return LDAP_SUCCESS;
 	}