Fix numeric match assert

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 1660aaa914026bc8d4a0a7485c619606877c1476..3778c45a3c4fc10dc779f9e1221859750a7b6b69 100644 (file)
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -243,4 +243,5 @@ find_extop( extop_list_t *list, char *oid )
                        return(ext);
        }
        return(NULL);
-}
\ No newline at end of file
+}
+

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index f08bc5ec398939baa382081dc961a8c7c94a445c..3e874d532b66bf40d943d31024e070292e34b578 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -3216,8 +3216,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';