From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 6 Aug 2025 14:21:57 +0000 (+0200)
Subject: tls: don't accept NULL ALPN name in TLS_CreateInstance()
X-Git-Tag: 4.8-pre1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b365edb48edad9f783ef5a05836fbaa53c1063f8;p=thirdparty%2Fchrony.git

tls: don't accept NULL ALPN name in TLS_CreateInstance()

The TLS_CreateInstance() function handles a NULL alpn_name, but the
other session functions would crash if it was NULL. Change the function
to not handle the NULL for consistency and avoid potential confusion.

Fixes: 3e32e7e69412 ("tls: move gnutls code into tls_gnutls.c")
---

diff --git a/tls_gnutls.c b/tls_gnutls.c
index 21ec7a4c..eda1c2af 100644
--- a/tls_gnutls.c
+++ b/tls_gnutls.c
@@ -174,7 +174,7 @@ TLS_CreateInstance(int server_mode, int sock_fd, const char *server_name, const
   inst->session = NULL;
   inst->server = server_mode;
   inst->label = Strdup(label);
-  inst->alpn_name = alpn_name ? Strdup(alpn_name) : NULL;
+  inst->alpn_name = Strdup(alpn_name);
 
   r = gnutls_init(&inst->session, GNUTLS_NONBLOCK | GNUTLS_NO_TICKETS |
                                   (server_mode ? GNUTLS_SERVER : GNUTLS_CLIENT));
@@ -238,9 +238,7 @@ TLS_DestroyInstance(TLS_Instance inst)
     gnutls_deinit(inst->session);
 
   Free(inst->label);
-
-  if (inst->alpn_name)
-    Free(inst->alpn_name);
+  Free(inst->alpn_name);
 
   Free(inst);
 }