From c723a77e1c5de6e1b93c08bd64522b415399ae7a Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Sat, 24 Dec 2005 09:20:06 +0000 Subject: [PATCH] Fix crasher in slapi_over_unmerge_controls() (if called from cleanup handler where merge controls was not called) --- servers/slapd/slapi/slapi_overlay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.39.5