ITS#5934

diff --git a/CHANGES b/CHANGES
index b371d1f4e0027f7d9833a396eacfcdae8bffc7d3..831dedb5ed9f5519941b492f2abc24cd0a857871 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.4.14 Engineering
        Added libldap GnuTLS setting random file (ITS#5462)
        Added libldap alias dereferencing in C API (ITS#5916)
        Fixed libldap deref handling (ITS#5768)
+       Fixed libldap NULL pointer deref (ITS#5934)
        Fixed libldap peer cert memory leak (ITS#5849)
        Fixed libldap interaction with GnuTLS CN IP-based matches (ITS#5789)
        Fixed libldap intermediate response behavior (ITS#5896)

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 797dc2c3d030e3acf7dc3d94775c25246169928a..0fdf5c9794b755b9a30b7de27b99b3ffcc9aa5ea 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -452,9 +452,9 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc **srvlist, int use_ldsb,
        ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
 #endif
 
-       if ( lc->lconn_server->lud_exts ) {
+       if ( connect ) {
 #ifdef HAVE_TLS
-               if ( connect ) {
+               if ( lc->lconn_server->lud_exts ) {
                        int rc, ext = find_tls_ext( lc->lconn_server );
                        if ( ext ) {
                                LDAPConn        *savedefconn;
@@ -480,7 +480,6 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc **srvlist, int use_ldsb,
                                        return NULL;
                                }
                        }
-                       
                }
 #endif
        }