mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#8999 more for prev commit

Browse Source
This commit is contained in:
Howard Chu 2019-03-26 13:12:26 +00:00
parent d8c90a2fee
commit 8b7f21c7aa
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
servers/slapd/schema_init.c
View File

@ -2310,7 +2310,8 @@ telephoneNumberNormalize(
struct berval *normalized,
void *ctx )
{
char *p, *q, *end;
char *q;
ber_len_t c;
assert( SLAP_MR_IS_VALUE_OF_SYNTAX( usage ) != 0 );
@ -2322,10 +2323,9 @@ telephoneNumberNormalize(
q = normalized->bv_val = slap_sl_malloc( val->bv_len + 1, ctx );
end = val->bv_val + val->bv_len;
for( p = val->bv_val; *p && p < end; p++ ) {
if ( ! ( ASCII_SPACE( *p ) || *p == '-' )) {
*q++ = *p;
for( c = 0; c < val->bv_len; c++ ) {
if ( ! ( ASCII_SPACE( val->bv_val[c] ) || val->bv_val[c] == '-' )) {
*q++ = val->bv_val[c];
}
}
if ( q == normalized->bv_val ) {
@ -2866,18 +2866,19 @@ IA5StringNormalize(
struct berval *normalized,
void *ctx )
{
char *p, *q;
char *p, *q, *end;
int casefold = !SLAP_MR_ASSOCIATED( mr,
slap_schema.si_mr_caseExactIA5Match );
assert( SLAP_MR_IS_VALUE_OF_SYNTAX( use ) != 0 );
p = val->bv_val;
end = val->bv_val + val->bv_len;
/* Ignore initial whitespace */
while ( ASCII_SPACE( *p ) ) p++;
while ( p < end && ASCII_SPACE( *p ) ) p++;
normalized->bv_len = val->bv_len - ( p - val->bv_val );
normalized->bv_len = p < end ? (val->bv_len - ( p - val->bv_val )) : 0;
normalized->bv_val = slap_sl_malloc( normalized->bv_len + 1, ctx );
AC_MEMCPY( normalized->bv_val, p, normalized->bv_len );
normalized->bv_val[normalized->bv_len] = '\0';