]> git.sur5r.net Git - openldap/commitdiff
More for ITS#6686
authorQuanah Gibson-Mount <quanah@openldap.org>
Tue, 4 Jan 2011 20:25:10 +0000 (20:25 +0000)
committerQuanah Gibson-Mount <quanah@openldap.org>
Tue, 4 Jan 2011 20:25:10 +0000 (20:25 +0000)
servers/slapd/overlays/sssvlv.c

index a8ded053a03bc445052065707a14c1afa3b557b2..0bef102d638456aaaa97c7088accaa043cbfe7d9 100644 (file)
@@ -164,11 +164,13 @@ static int node_cmp( const void* val1, const void* val2 )
 {
        sort_node *sn1 = (sort_node *)val1;
        sort_node *sn2 = (sort_node *)val2;
-       assert( sort_conns[sn1->sn_conn] && sort_conns[sn1->sn_conn][sn1->sn_session]
-               && sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl );
-       sort_ctrl *sc = sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl;
+       sort_ctrl *sc;
        MatchingRule *mr;
        int i, cmp = 0;
+       assert( sort_conns[sn1->sn_conn]
+               && sort_conns[sn1->sn_conn][sn1->sn_session]
+               && sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl );
+       sc = sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl;
 
        for ( i=0; cmp == 0 && i<sc->sc_nkeys; i++ ) {
                if ( BER_BVISNULL( &sn1->sn_vals[i] )) {