]> git.sur5r.net Git - openldap/commitdiff
Don't assert on short time strings, just ignore them.
authorHoward Chu <hyc@openldap.org>
Mon, 6 Dec 2004 03:37:06 +0000 (03:37 +0000)
committerHoward Chu <hyc@openldap.org>
Mon, 6 Dec 2004 03:37:06 +0000 (03:37 +0000)
servers/slapd/schema_init.c

index e8c97c30e9b708c2b32f7ac1040521680105f3cb..95190c90536952faf8d1f5551ea62b42dbd48e86 100644 (file)
@@ -2732,9 +2732,9 @@ int generalizedTimeFilter(
        keys = slap_sl_malloc( sizeof( struct berval ) * 2, ctx );
 
        /* GeneralizedTime YYYYmmddHH[MM[SS]][(./,)d...](Z|(+/-)HH[MM]) */
-       assert(value->bv_val != NULL && value->bv_len >= 10);
        /* Use 40 bits of time for key */
-       if ( lutil_parsetime( value->bv_val, &tm ) == 0 ) {
+       if ( value->bv_val && value->bv_len >= 10 &&
+               lutil_parsetime( value->bv_val, &tm ) == 0 ) {
                lutil_tm2time( &tm, &tt );
                tmp[0] = tt.tt_gsec & 0xff;
                tmp[4] = tt.tt_sec & 0xff;