From: Hugo Landau <hlandau@openssl.org>
Date: Thu, 9 Nov 2023 10:27:13 +0000 (+0000)
Subject: QUIC CHANNEL: Make a QUIC_PORT mandatory
X-Git-Tag: openssl-3.3.0-alpha1~441
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=496f0beb99aa378867e69cfd98374dcbab0cd153;p=thirdparty%2Fopenssl.git

QUIC CHANNEL: Make a QUIC_PORT mandatory

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
---

diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c
index 22a1b158d2f..8a7ddb9f391 100644
--- a/ssl/quic/quic_channel.c
+++ b/ssl/quic/quic_channel.c
@@ -274,6 +274,9 @@ static int ch_init(QUIC_CHANNEL *ch)
     uint32_t pn_space;
     size_t rx_short_cid_len = ch->is_server ? INIT_DCID_LEN : 0;
 
+    if (ch->port == NULL)
+        goto err;
+
     ossl_list_stateless_reset_tokens_init(&ch->srt_list_seq);
     ch->srt_hash_tok = lh_QUIC_SRT_ELEM_new(&chan_reset_token_hash,
                                             &chan_reset_token_cmp);