Changeset 6148 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Jan 31, 2020 9:55:43 AM (4 years ago)

Author:

nanang

Message:

Misc (re #2210): Reverting r6133 as it is reported to cause crash on OpenSSL 1.0.x, and OpenSSL docs explicitly prohibit freeing SSL_SESSION after SSL_free(). Thanks Peter Koletzki for the report.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -570 +570 @@
 
         SSL_free(ssl);
+
+        /* On OpenSSL 1.1.1, omitting SSL_SESSION_free() will cause 
+         * memory leak (e.g: as reported by Address Sanitizer). But using
+         * SSL_SESSION_free() may cause crash (due to double free?) on 1.0.x.
+         * As OpenSSL docs specifies to not calling SSL_SESSION_free() after
+         * SSL_free(), perhaps it is safer to obey this, the leak amount seems
+         * to be relatively small (<500 bytes) and should occur once only in
+         * the library lifetime.
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L
         SSL_SESSION_free(ssl_sess);
+#endif
+         */
+
         SSL_CTX_free(ctx);
     }