aboutsummaryrefslogtreecommitdiff
path: root/lib/urldata.h
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-02-09 23:37:14 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-02-09 23:37:14 +0100
commit716302c2cd59f96ecd96f949db92576d204cabae (patch)
tree497f9a4953146251e24a0db1bb121b99aadd71e4 /lib/urldata.h
parent50cd9c8aa1fbd227ce38c009a82cbe5fb82e0a51 (diff)
mbedtls: fix ALPN usage segfault
Since we didn't keep the input argument around after having called mbedtls, it could end up accessing the wrong memory when figuring out the ALPN protocols. Closes #642
Diffstat (limited to 'lib/urldata.h')
-rw-r--r--lib/urldata.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/urldata.h b/lib/urldata.h
index e7341ac0f..ab26c0111 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -297,6 +297,7 @@ struct ssl_connect_data {
mbedtls_x509_crl crl;
mbedtls_pk_context pk;
mbedtls_ssl_config config;
+ const char *protocols[3];
#elif defined(USE_POLARSSL)
ctr_drbg_context ctr_drbg;
entropy_context entropy;