ITS#9828 Fix ldap_count_values_len pointer confusion

diff --git a/libraries/libldap/getvalues.c b/libraries/libldap/getvalues.c
index b3ac1907f83649de5895ed00638742194924d503..4e3d6c28270a3041831991c5f527194b6ee68071 100644 (file)
--- a/libraries/libldap/getvalues.c
+++ b/libraries/libldap/getvalues.c
@@ -159,7 +159,15 @@ ldap_count_values( char **vals )
 int
 ldap_count_values_len( struct berval **vals )
 {
-       return( ldap_count_values( (char **) vals ) );
+       int i;
+
+       if ( vals == NULL )
+               return 0;
+
+       for ( i = 0; !BER_BVISNULL( vals[i] ); i++ )
+               ; /* NULL */
+
+       return i;
 }
 
 void