ITS#9425 add more checks to ldap_X509dn2bv

diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
index e0c82fa9f84d7d8d8828212b4e9d79b82b30abc8..193d20fdfa7c0fe3ba416be1d4e39904aa9e312a 100644 (file)
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
@@ -1248,6 +1248,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++;
@@ -1257,7 +1259,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 */    
@@ -1370,6 +1372,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;