commit a5bb1aa128dcadf7a026061b2804646f5fbaa72c
author Benjamin Kaduk <bkaduk@akamai.com> Tue Mar 14 19:17:15 2017 -0500
committer Richard Levitte <levitte@openssl.org> Wed Mar 15 03:18:01 2017 +0100
tree c066603523f06ef62116bd341ef182da1c5aa8d5
parent 1ae4c07e50a4988c7e2263ad669dc75fe2d494cb

Clear alpn_selected_len for clients, too

Zero out the length alongside the NULLing of the pointer, to
bring parity between the selected and proposed fields..

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2954)

ssl/statem/extensions.c

diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index ffacd41..0ab1f04 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -875,8 +875,8 @@
 {
     OPENSSL_free(s->s3->alpn_selected);
     s->s3->alpn_selected = NULL;
+    s->s3->alpn_selected_len = 0;
     if (s->server) {
-        s->s3->alpn_selected_len = 0;
         OPENSSL_free(s->s3->alpn_proposed);
         s->s3->alpn_proposed = NULL;
         s->s3->alpn_proposed_len = 0;