From: Neil Horman <nhorman@openssl.org>
Date: Wed, 22 Jan 2025 19:29:19 +0000 (-0500)
Subject: Fix up some nits
X-Git-Tag: openssl-3.5.0-alpha1~253
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5569e170ee04267114fff18bff788bad967ff799;p=thirdparty%2Fopenssl.git

Fix up some nits

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

diff --git a/include/internal/quic_port.h b/include/internal/quic_port.h
index faad3357a2d..6dda25db84f 100644
--- a/include/internal/quic_port.h
+++ b/include/internal/quic_port.h
@@ -44,7 +44,7 @@ typedef struct quic_port_args_st {
 
     /*
      * This callback allows port_new_handshake_layer to pre-create a quic
-     * connection object for the incomming channel
+     * connection object for the incoming channel
      * user_ssl_arg is expected to point to a quic listener object
      */
     SSL *(*get_conn_user_ssl)(QUIC_CHANNEL *ch, void *arg);
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index cade45de441..0abc13126cb 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -4600,7 +4600,6 @@ static QUIC_CONNECTION *create_qc_from_incoming_conn(QUIC_LISTENER *ql, QUIC_CHA
     }
 
     ossl_quic_channel_get_peer_addr(ch, &qc->init_peer_addr); /* best effort */
-    qc->listener                = NULL;
     qc->pending                 = 1;
     qc->engine                  = ql->engine;
     qc->port                    = ql->port;
diff --git a/ssl/quic/quic_port.c b/ssl/quic/quic_port.c
index 01dfbb84ef0..1a4e1780d07 100644
--- a/ssl/quic/quic_port.c
+++ b/ssl/quic/quic_port.c
@@ -479,7 +479,8 @@ static SSL *port_new_handshake_layer(QUIC_PORT *port, QUIC_CHANNEL *ch)
                                                   ql->obj.ssl.ctx->new_pending_conn_arg)) {
             SSL_free(tls);
             SSL_free(user_ssl);
-            qc->tls = NULL;
+            if (qc != NULL)
+                qc->tls = NULL;
             return NULL;
         }