diff --git a/libraries/libldap/charray.c b/libraries/libldap/charray.c
index b679f75d83..b9ad8037af 100644
--- a/libraries/libldap/charray.c
+++ b/libraries/libldap/charray.c
@@ -191,8 +191,8 @@ ldap_str2charray( const char *str_in, const char *brkstr )
 	}
 
 	i = 1;
-	for ( s = str; *s; LDAP_UTF8_INCR(s) ) {
-		s = ldap_utf8_strchr( s, brkstr );
+	for ( s = str; ; LDAP_UTF8_INCR(s) ) {
+		s = ldap_utf8_strpbrk( s, brkstr );
 		if ( !s ) break;
 		i++;
 	}