ITS#1274 fix

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index e62e90f91b8a4c25cb507e0944cb584180e8a1e7..c8ee4b9e38c79b903e0fb7dbb7729a9a70c2d93d 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -776,7 +776,6 @@ approxIndexer(
 
 
        for( j=0; values[j] != NULL; j++ ) {
-
                /* Isolate how many words there are. There will be a key for each */
                val = ch_strdup( values[j]->bv_val );
                for( wordcount=0,c=val;  *c;  c++) {
@@ -828,7 +827,6 @@ approxFilter(
        int i, count, len;
        struct berval **keys;
 
-
        /* Isolate how many words there are. There will be a key for each */
        val = ch_strdup( ((struct berval *)assertValue)->bv_val );
        for( count=0,c=val;  *c;  c++) {
@@ -899,7 +897,6 @@ approxIndexer(
        int i;
        struct berval **keys;
 
-
        for( i=0; values[i] != NULL; i++ ) {
                /* just count them */
        }
@@ -932,7 +929,6 @@ approxFilter(
 {
        struct berval **keys;
 
-
        keys = (struct berval **)ch_malloc( sizeof( struct berval * ) * 2 );
 
        /* Copy the value and run it through phonetic() */
@@ -3623,8 +3619,8 @@ numericStringNormalize(
                }
        }
 
-       assert( newval->bv_val <= p );
-       assert( q <= p );
+       /* we should have copied no more then is in val */
+       assert( (q - newval->bv_val) <= (p - val->bv_val) );
 
        /* null terminate */
        *q = '\0';