ITS#9423 ldap_X509dn2bv: check for invalid BER after RDN count

diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
index ca5a44ab0caeb837df4d8b482db6732515f34046..e0c82fa9f84d7d8d8828212b4e9d79b82b30abc8 100644 (file)
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
@@ -1254,6 +1254,12 @@ 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 )
+               return LDAP_DECODING_ERROR;
+
        /* Allocate the DN/RDN/AVA stuff as a single block */    
        dnsize = sizeof(LDAPRDN) * (nrdns+1);
        dnsize += sizeof(LDAPAVA *) * (navas+nrdns);
@@ -1265,16 +1271,12 @@ ldap_X509dn2bv( void *x509_name, struct berval *bv, LDAPDN_rewrite_func *func,
        } else {
                newDN = (LDAPDN)(char *)ptrs;
        }
-       
+
        newDN[nrdns] = NULL;
        newRDN = (LDAPRDN)(newDN + nrdns+1);
        newAVA = (LDAPAVA *)(newRDN + navas + nrdns);
        baseAVA = newAVA;
 
-       /* Rewind and start extracting */
-       ber_rewind( ber );
-
-       tag = ber_first_element( ber, &len, &dn_end );
        for ( i = nrdns - 1; i >= 0; i-- ) {
                newDN[i] = newRDN;