upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 23:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix UTF8stringvalidate loop termination (coverity)

Browse source
This commit is contained in:
Howard Chu 2015-01-14 10:35:20 +00:00
parent 67c13d0ccf
commit 45146ba21a
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
servers/slapd/schema_init.c
View file

@ -1780,16 +1780,15 @@ UTF8StringValidate(
Syntax *syntax, Syntax *syntax,
struct berval *in ) struct berval *in )
{ {
ber_len_t count;
int len; int len;
unsigned char *u = (unsigned char *)in->bv_val; unsigned char *u = (unsigned char *)in->bv_val, *end = in->bv_val + in->bv_len;
if( BER_BVISEMPTY( in ) && syntax == slap_schema.si_syn_directoryString ) { if( BER_BVISEMPTY( in ) && syntax == slap_schema.si_syn_directoryString ) {
/* directory strings cannot be empty */ /* directory strings cannot be empty */
return LDAP_INVALID_SYNTAX; return LDAP_INVALID_SYNTAX;
} }
for( count = in->bv_len; count > 0; count -= len, u += len ) { for( ; u < end; u += len ) {
/* get the length indicated by the first byte */ /* get the length indicated by the first byte */
len = LDAP_UTF8_CHARLEN2( u, len ); len = LDAP_UTF8_CHARLEN2( u, len );
@ -1827,7 +1826,7 @@ UTF8StringValidate(
if( LDAP_UTF8_OFFSET( (char *)u ) != len ) return LDAP_INVALID_SYNTAX; if( LDAP_UTF8_OFFSET( (char *)u ) != len ) return LDAP_INVALID_SYNTAX;
} }
if( count != 0 ) { if( u >= len ) {
return LDAP_INVALID_SYNTAX; return LDAP_INVALID_SYNTAX;
} }