[PATCH] ITS#9383 remove assert in certificateListValidate
authorHoward Chu <hyc@openldap.org>
Mon, 2 Nov 2020 13:12:10 +0000 (13:12 +0000)
committerRyan Tandy <ryan@nardis.ca>
Fri, 22 Jan 2021 03:54:40 +0000 (03:54 +0000)
Gbp-Pq: Name ITS-9383-remove-assert-in-certificateListValidate.patch

servers/slapd/schema_init.c

index 6a512a286d9fbdf617443f6ae43591d295bf32c6..cd979cc5ac778b96f9f1f1c6af63a4ebea0884f9 100644 (file)
@@ -371,8 +371,7 @@ certificateListValidate( Syntax *syntax, struct berval *in )
        /* Optional version */
        if ( tag == LBER_INTEGER ) {
                tag = ber_get_int( ber, &version );
-               assert( tag == LBER_INTEGER );
-               if ( version != SLAP_X509_V2 ) return LDAP_INVALID_SYNTAX;
+               if ( tag != LBER_INTEGER || version != SLAP_X509_V2 ) return LDAP_INVALID_SYNTAX;
        }
        tag = ber_skip_tag( ber, &len );        /* Signature Algorithm */
        if ( tag != LBER_SEQUENCE ) return LDAP_INVALID_SYNTAX;