From 27d27af07f136206fa44954119be63cd5c199995 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 15 Apr 2010 22:26:42 +0000
Subject: [PATCH] More for ITS#6456
---
servers/slapd/back-ldap/config.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 816890bfc3..73aecca317 100644
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -686,9 +686,11 @@ slap_idassert_authzfrom_parse( ConfigArgs *c, slap_idassert_t *si )
ber_bvarray_add( &si->si_authz, &bv );
} else {
- int i;
- for ( i = 0; !BER_BVISNULL( &si->si_authz[ i ] ); i++ )
- ;
+ int i = 0;
+ if ( si->si_authz != NULL ) {
+ for ( ; !BER_BVISNULL( &si->si_authz[ i ] ); i++ )
+ ;
+ }
if ( i <= c->valx ) {
ber_bvarray_add( &si->si_authz, &bv );
@@ -731,9 +733,11 @@ slap_idassert_passthru_parse( ConfigArgs *c, slap_idassert_t *si )
ber_bvarray_add( &si->si_passthru, &bv );
} else {
- int i;
- for ( i = 0; !BER_BVISNULL( &si->si_passthru[ i ] ); i++ )
- ;
+ int i = 0;
+ if ( si->si_passthru != NULL ) {
+ for ( ; !BER_BVISNULL( &si->si_passthru[ i ] ); i++ )
+ ;
+ }
if ( i <= c->valx ) {
ber_bvarray_add( &si->si_passthru, &bv );
--
GitLab