From: Neil Horman <nhorman@openssl.org>
Date: Thu, 17 Apr 2025 15:51:07 +0000 (-0400)
Subject: Fix segfault on qlog creation with no tls
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3702f51c29f25aee25951b4d48fd4093f475e107;p=thirdparty%2Fopenssl.git

Fix segfault on qlog creation with no tls

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27397)
---

diff --git a/ssl/quic/quic_port.c b/ssl/quic/quic_port.c
index 6f2be905721..326a0ab0982 100644
--- a/ssl/quic/quic_port.c
+++ b/ssl/quic/quic_port.c
@@ -554,7 +554,7 @@ static QUIC_CHANNEL *port_make_channel(QUIC_PORT *port, SSL *tls, OSSL_QRX *qrx,
      * If we're using qlog, make sure the tls get further configured properly
      */
     ch->use_qlog = 1;
-    if (ch->tls->ctx->qlog_title != NULL) {
+    if (ch->tls && ch->tls->ctx->qlog_title != NULL) {
         if ((ch->qlog_title = OPENSSL_strdup(ch->tls->ctx->qlog_title)) == NULL) {
             OPENSSL_free(ch);
             return NULL;