From 3e821c6f2b0863d0dec4c76dd761e8d12f5823a3 Mon Sep 17 00:00:00 2001 From: Anthony Hu Date: Thu, 22 Jun 2023 15:01:11 -0400 Subject: [PATCH] make sure that when TLSX_ALPN_GetRequest() returns data and dataSz are not pointing to junk. --- src/tls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tls.c b/src/tls.c index 1be158e6b..d16dba684 100644 --- a/src/tls.c +++ b/src/tls.c @@ -1803,6 +1803,9 @@ int TLSX_ALPN_GetRequest(TLSX* extensions, void** data, word16 *dataSz) if (extensions == NULL || data == NULL || dataSz == NULL) return BAD_FUNC_ARG; + *data = NULL; + *dataSz = 0; + extension = TLSX_Find(extensions, TLSX_APPLICATION_LAYER_PROTOCOL); if (extension == NULL) { WOLFSSL_MSG("TLS extension not found"); @@ -1813,8 +1816,6 @@ int TLSX_ALPN_GetRequest(TLSX* extensions, void** data, word16 *dataSz) alpn = (ALPN *)extension->data; if (alpn == NULL) { WOLFSSL_MSG("ALPN extension not found"); - *data = NULL; - *dataSz = 0; WOLFSSL_ERROR_VERBOSE(WOLFSSL_FATAL_ERROR); return WOLFSSL_FATAL_ERROR; }