postfix-3.3.14

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 260afbb7ebfd6b25e5c9d9ff7c621d2e47a7c5c9..4076b7910c81e04e1918f9a885840baf04ffe58f 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23651,3 +23651,8 @@ Apologies for any names omitted.
        settings in a system-wide OpenSSL configuration file, causing
        interoperability problems after an OS update. File:
        tls/tls_client.c, tls/tls_server.c.
+
+20200726
+
+       Bugfix (introduced: Postfix 3.3.13): part of a memory leak
+       fix was backported to the wrong place. File: tls/tls_misc.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index be2774406024b88b109c09dccdc6ba3c8ff28061..ceaa839be36c01b5bccbd274c4326dbcaebc838f 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20200724"
-#define MAIL_VERSION_NUMBER    "3.3.13"
+#define MAIL_RELEASE_DATE      "20200726"
+#define MAIL_VERSION_NUMBER    "3.3.14"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE      "-" MAIL_RELEASE_DATE

diff --git a/postfix/src/tls/tls_misc.c b/postfix/src/tls/tls_misc.c
index e401669e89fa547dfbab37fb85fe1cc02466e56b..0673ff89f74a56924b4bb16ea56cdf0ec4dd1d23 100644 (file)
--- a/postfix/src/tls/tls_misc.c
+++ b/postfix/src/tls/tls_misc.c
@@ -961,8 +961,6 @@ void    tls_get_signature_params(TLS_SESS_STATE *TLScontext)
         */
        if (SSL_get_signature_nid(ssl, &nid) && nid != NID_undef)
            locl_sig_dgst = OBJ_nid2sn(nid);
-
-       X509_free(cert);
     }
     /* Signature algorithms for the peer end of the connection */
     if ((cert = SSL_get_peer_certificate(ssl)) != 0) {
@@ -1004,6 +1002,8 @@ void    tls_get_signature_params(TLS_SESS_STATE *TLScontext)
         */
        if (SSL_get_peer_signature_nid(ssl, &nid) && nid != NID_undef)
            peer_sig_dgst = OBJ_nid2sn(nid);
+
+       X509_free(cert);
     }
     if (kex_name) {
        TLScontext->kex_name = mystrdup(kex_name);