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 48c6d9bc14d0fe325edb5911acdeeaaf2308d0cc..80179429f899178f70ae83ac952061532bdbe9fd 100644 (file)
--- 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;
        }