From ee1b77273755692bfb3430cb26b732238337a6ae Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 4 Jan 2011 20:25:10 +0000 Subject: [PATCH] More for ITS#6686 --- servers/slapd/overlays/sssvlv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c index a8ded053a0..0bef102d63 100644 --- a/servers/slapd/overlays/sssvlv.c +++ b/servers/slapd/overlays/sssvlv.c @@ -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 && isc_nkeys; i++ ) { if ( BER_BVISNULL( &sn1->sn_vals[i] )) { -- 2.39.5