PATCH: smtpserver/smtptls.c

["Darryl L. Miles" <darryl@netbauds.net>]

This fixes data lifecycle, the returned reference from OpenSSL is owned 
by the library, so this brings the data into line with the rest fixing 
the glibc double free error.

Index: smtptls.c
===================================================================
RCS file: /cvsroot/zmailer/smtpserver/smtptls.c,v
retrieving revision 1.37
diff -u -r1.37 smtptls.c
--- smtptls.c   2 Jul 2005 01:19:38 -0000       1.37
+++ smtptls.c   6 Apr 2006 13:16:47 -0000
@@ -1293,6 +1293,7 @@
     SSL_CIPHER  * cipher;
     X509       * peer;
     char       cbuf[4000];
+    const char * kp;

     BIO                *wbio, *rbio;
     BIO_METHOD  *rbiomethod_old;
@@ -1581,9 +1582,17 @@
     /*
      * Finally, collect information about protocol and cipher for logging
      */
-    SS->TLS.protocol = SSL_get_version(SS->TLS.ssl);
+    kp = SSL_get_version(SS->TLS.ssl);
+    if (kp)
+       SS->TLS.protocol = strdup(kp);
+    else
+       SS->TLS.protocol = NULL;
     cipher = SSL_get_current_cipher(SS->TLS.ssl);
-    SS->TLS.cipher_name    = SSL_CIPHER_get_name(cipher);
+    kp = SSL_CIPHER_get_name(cipher);
+    if (kp)
+       SS->TLS.cipher_name = strdup(kp);
+    else
+       SS->TLS.cipher_name = NULL;
     SS->TLS.cipher_usebits = SSL_CIPHER_get_bits(cipher,
                                                 &SS->TLS.cipher_algbits);




-- 
Darryl L. Miles


-
To unsubscribe from this list: send the line "unsubscribe zmailer" in
the body of a message to majordomo@nic.funet.fi