ITS#1998 UTF8StringNormalize should accept all-space vals

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 4e8ac815f89ddbca06df111e1f86e83718c8cfd8..29f2ae0b387e38ef99fbeff7e752cc0bc1ac8bd0 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -548,10 +548,10 @@ UTF8StringNormalize(
        /* All space is ASCII. All ASCII is 1 byte */
        for ( ; p < val->bv_val + val->bv_len && ASCII_SPACE( p[ 0 ] ); p++ );
 
-       ber_mem2bv( p, val->bv_len - (p - val->bv_val), 1, normalized );
-       e = normalized->bv_val + val->bv_len - (p - val->bv_val);
+       normalized->bv_len = val->bv_len - (p - val->bv_val);
+       ber_mem2bv( p, normalized->bv_len, 1, normalized );
+       e = normalized->bv_val + normalized->bv_len;
 
-       assert( normalized->bv_len );
        assert( normalized->bv_val );
 
        p = q = normalized->bv_val;
@@ -575,7 +575,7 @@ UTF8StringNormalize(
                }
        }
 
-       assert( normalized->bv_val < p );
+       assert( normalized->bv_val <= p );
        assert( q+len <= p );
 
        /* cannot start with a space */