From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 24 Jul 2001 19:54:04 +0000 (+0000)
Subject: ITS#1274 fix
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~1201
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e2b3914982b743090114424ff83792bcc89400fb;p=openldap

ITS#1274 fix
---

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index e62e90f91b..c8ee4b9e38 100644
--- 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';