ITS#9425 add more checks to ldap_X509dn2bv

diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
index 8c39f5f60b4ed73e9fc739f9983a1279ad3bd7db..1e9b5aa4673786ac00e9cc9f450b556705b7f0be 100644 (file)
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
@@ -1499,6 +1499,8 @@ ldap_X509dn2bv( void *x509_name, struct berval *bv, LDAPDN_rewrite_func *func,
                for ( tag = ber_first_element( ber, &len, &rdn_end );
                        tag == LBER_SEQUENCE;
                        tag = ber_next_element( ber, &len, rdn_end )) {
+                       if ( rdn_end > dn_end )
+                               return LDAP_DECODING_ERROR;
                        tag = ber_skip_tag( ber, &len );
                        ber_skip_data( ber, len );
                        navas++;
@@ -1508,7 +1510,7 @@ ldap_X509dn2bv( void *x509_name, struct berval *bv, LDAPDN_rewrite_func *func,
        /* Rewind and prepare to extract */
        ber_rewind( ber );
        tag = ber_first_element( ber, &len, &dn_end );
-       if ( tag == LBER_DEFAULT )
+       if ( tag != LBER_SET )
                return LDAP_DECODING_ERROR;
 
        /* Allocate the DN/RDN/AVA stuff as a single block */    
@@ -1621,6 +1623,10 @@ allocd:
                                /* X.690 bitString value converted to RFC4517 Bit String */
                                rc = der_to_ldap_BitString( &Val, &newAVA->la_value );
                                goto allocd;
+                       case LBER_DEFAULT:
+                               /* decode error */
+                               rc = LDAP_DECODING_ERROR;
+                               goto nomem;
                        default:
                                /* Not a string type at all */
                                newAVA->la_flags = 0;