From: Scott Deboy <sdeboy@secondstryke.com>
Date: Thu, 12 Sep 2013 00:22:00 +0000 (-0700)
Subject: Initialize next_proto in s_server - resolves incorrect attempts to free
X-Git-Tag: master-pre-reformat~1134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F18%2Fhead;p=thirdparty%2Fopenssl.git

Initialize next_proto in s_server - resolves incorrect attempts to free
---

diff --git a/apps/s_server.c b/apps/s_server.c
index 35f30e4d23e..9359161758c 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1065,7 +1065,7 @@ int MAIN(int argc, char *argv[])
         tlsextctx tlsextcbp = {NULL, NULL, SSL_TLSEXT_ERR_ALERT_WARNING};
 # ifndef OPENSSL_NO_NEXTPROTONEG
 	const char *next_proto_neg_in = NULL;
-	tlsextnextprotoctx next_proto;
+	tlsextnextprotoctx next_proto = { NULL, 0};
 	const char *alpn_in = NULL;
 	tlsextalpnctx alpn_ctx = { NULL, 0};
 # endif