upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-29 10:07:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8778 Fix telephoneNumberNormalize("-" or " ")

Browse source
This commit is contained in:
Hallvard Furuseth 2017-11-26 21:22:23 +01:00
parent f5da6638ec
commit 57253688b3
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
servers/slapd/schema_init.c
View file

@ -2290,7 +2290,7 @@ approxFilter(
return LDAP_SUCCESS;
}
/* Remove all spaces and '-' characters */
/* Remove all spaces and '-' characters, unless the result would be empty */
static int
telephoneNumberNormalize(
slap_mask_t usage,
@ -2304,8 +2304,11 @@ telephoneNumberNormalize(
assert( SLAP_MR_IS_VALUE_OF_SYNTAX( usage ) != 0 );
/* validator should have refused an empty string */
assert( !BER_BVISEMPTY( val ) );
/* Ensure q is big enough, though validator should have caught this */
if ( BER_BVISEMPTY( val )) {
BER_BVZERO( normalized );
return LDAP_INVALID_SYNTAX;
}
q = normalized->bv_val = slap_sl_malloc( val->bv_len + 1, ctx );
@ -2314,16 +2317,13 @@ telephoneNumberNormalize(
*q++ = *p;
}
}
if ( q == normalized->bv_val ) {
*q++ = ' ';
}
*q = '\0';
normalized->bv_len = q - normalized->bv_val;
if( BER_BVISEMPTY( normalized ) ) {
slap_sl_free( normalized->bv_val, ctx );
BER_BVZERO( normalized );
return LDAP_INVALID_SYNTAX;
}
return LDAP_SUCCESS;
}