--- openldap-2.4.45+dfsg.orig/servers/slapd/ad.c
+++ openldap-2.4.45+dfsg/servers/slapd/ad.c
@@ -145,7 +145,7 @@ static char *strchrlen(
 {
 	const char *p;
 
-	for( p=beg; *p && p < end; p++ ) {
+	for( p=beg; p < end && *p; p++ ) {
 		if( *p == ch ) {
 			*len = p - beg;
 			return (char *) p;