From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 23 Jun 2000 23:57:53 +0000 (+0000)
Subject: DirectoryString syntaxes must have one or more octets to be valid.
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2543
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ae63be3894c799771d0ccabec1e376c7478cd263;p=openldap

DirectoryString syntaxes must have one or more octets to be valid.
---

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index a4b2edcf99..774876d7ff 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -310,6 +310,8 @@ UTF8StringValidate(
 	int len;
 	unsigned char *u = in->bv_val;
 
+	if( !in->bv_len ) return LDAP_INVALID_SYNTAX;
+
 	for( count = in->bv_len; count > 0; count-=len, u+=len ) {
 		/* get the length indicated by the first byte */
 		len = LDAP_UTF8_CHARLEN( u );
@@ -377,7 +379,7 @@ UTF8StringNormalize(
 
 	assert( *newval->bv_val );
 	assert( newval->bv_val < p );
-	assert( p <= q );
+	assert( p >= q );
 
 	/* cannot start with a space */
 	assert( !ldap_utf8_isspace(newval->bv_val) );
@@ -447,6 +449,8 @@ integerValidate(
 {
 	ber_len_t i;
 
+	if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
+
 	for(i=0; i < val->bv_len; i++) {
 		if( !ASCII_DIGIT(val->bv_val[i]) ) return LDAP_INVALID_SYNTAX;
 	}
@@ -461,6 +465,8 @@ printableStringValidate(
 {
 	ber_len_t i;
 
+	if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
+
 	for(i=0; i < val->bv_len; i++) {
 		if( !isprint(val->bv_val[i]) ) return LDAP_INVALID_SYNTAX;
 	}
@@ -475,6 +481,8 @@ IA5StringValidate(
 {
 	ber_len_t i;
 
+	if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
+
 	for(i=0; i < val->bv_len; i++) {
 		if( !isascii(val->bv_val[i]) ) return LDAP_INVALID_SYNTAX;
 	}