Sync with 2.x

[openldap] / libraries / libldap / url.c

diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index bc12e22719d997586822c174924d2e966a30cba4..adc08c9b48951ee2fc7f9791ce58b00064f1ef8d 100644 (file)
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -221,7 +221,7 @@ ldap_url_parse_ext( LDAP_CONST char *url_in, LDAPURLDesc **ludpp )
        const char *url_tmp;
        char *url;
 
-       if( url_in == NULL && ludpp == NULL ) {
+       if( url_in == NULL || ludpp == NULL ) {
                return LDAP_URL_ERR_PARAM;
        }
 
@@ -526,7 +526,6 @@ ldap_url_parse_ext( LDAP_CONST char *url_in, LDAPURLDesc **ludpp )
 
        if( i == 0 ) {
                /* must have 1 or more */
-               ldap_charray_free( ludp->lud_exts );
                LDAP_FREE( url );
                ldap_free_urldesc( ludp );
                return LDAP_URL_ERR_BADEXTS;