ITS#5849 again

diff --git a/CHANGES b/CHANGES
index f841ae536a3211a0aeda782c1982b3b115767a70..b4b0ddca466aee0c066c6cad5dc92c14b2f53178 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
 OpenLDAP 2.4.16 Engineering
        Fixed libldap GnuTLS TLSVerifyCilent try (ITS#5981)
        Fixed libldap segfault in checking cert/DN (ITS#5976)
+       Fixed libldap peer cert memory leak again (ITS#5849)
        Fixed slapd-bdb/hdb cachesize handling (ITS#5860)
        Fixed slapd-ldap/meta with broken AD results (ITS#5977)
        Fixed slapd-ldap/meta with invalid attrs again (ITS#5959)

diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
index 7936a2db14892d445cb826cb38fd0861c5bb3015..fc49529f927e095ee12e93a8fb030295a2515a99 100644 (file)
--- a/libraries/libldap/tls_o.c
+++ b/libraries/libldap/tls_o.c
@@ -421,7 +421,7 @@ tlso_session_my_dn( tls_session *sess, struct berval *der_dn )
        xn = X509_get_subject_name(x);
        der_dn->bv_len = i2d_X509_NAME( xn, NULL );
        der_dn->bv_val = xn->bytes->data;
-       X509_free(x);
+       /* Don't X509_free, the session is still using it */
        return 0;
 }