commit dd2516596867cce7586b47406c010d63ba73f289
author Dr. Stephen Henson <steve@openssl.org> Tue Jul 03 16:37:50 2012 +0000
committer Dr. Stephen Henson <steve@openssl.org> Tue Jul 03 16:37:50 2012 +0000
tree 6b243f6f22ef0621524e56cbf94ccc0ae3773cc1
parent 657e29c1999f02b8962ccbe26faa63cbccb4ff2e

Fix memory leak.

Always perform nexproto callback argument initialisation in s_server
otherwise we use uninitialised data if -nocert is specified.

apps/s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index a838362..ef798e8 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1965,6 +1965,10 @@
 			print_stuff(bio_c_out,con,1);
 		SSL_free(con);
 		}
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+	if (next_proto.data)
+		OPENSSL_free(next_proto.data);
+#endif
 	if (ctx != NULL) SSL_CTX_free(ctx);
 	if (cert)
 		X509_free(cert);