ITS#6288

diff --git a/CHANGES b/CHANGES
index d6cc6af5cdc4e51a8e143d5bb5dca6fdeb16c59e..41e936e9a78decf4c0ea7f2e065c6e288f1253f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ OpenLDAP 2.4.19 Engineering
        Fixed slapd tools to allow -n for conversion (ITS#6258)
        Fixed slapo-dynlist lock leak (ITS#6308)
        Fixed slapo-pcache cache corruption (ITS#6242)
+       Fixed slapo-sssvlv sort control dereferencing (ITS#6288)
        Fixed contrib/nssov getgroupbymembers (ITS#6291)
 
 OpenLDAP 2.4.18 Release (2009/09/06)

diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 8dccdab02c78ef2a5412edbf49c85946e75416d4..5c82b91212aef88870978452e6c317747de7e90e 100644 (file)
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -696,7 +696,7 @@ static int sssvlv_op_search(
        int                                             rc                      = SLAP_CB_CONTINUE;
        int     ok;
        sort_op *so, so2;
-       sort_ctrl *sc = op->o_controls[sss_cid];
+       sort_ctrl *sc;
        PagedResultsState *ps;
        vlv_ctrl *vc;
 
@@ -725,6 +725,7 @@ static int sssvlv_op_search(
                op->o_req_dn.bv_val, op->ors_filterstr.bv_val,
                op->o_ctrlflag[sss_cid]);
 
+       sc = op->o_controls[sss_cid];
        if ( sc->sc_nkeys > si->svi_max_keys ) {
                rs->sr_text = "Too many sort keys";
                rs->sr_err = LDAP_UNWILLING_TO_PERFORM;