From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 4 Jan 2011 20:25:10 +0000 (+0000)
Subject: More for ITS#6686
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~137
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ee1b77273755692bfb3430cb26b732238337a6ae;p=openldap

More for ITS#6686
---

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 && i<sc->sc_nkeys; i++ ) {
 		if ( BER_BVISNULL( &sn1->sn_vals[i] )) {