From: Hugo Landau <hlandau@openssl.org>
Date: Wed, 8 Mar 2023 10:29:44 +0000 (+0000)
Subject: QUIC DEMUX: Ensure time field is always initialised
X-Git-Tag: openssl-3.2.0-alpha1~1116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29fb7f087994b5cffe1613da25bb8c3231e59e15;p=thirdparty%2Fopenssl.git

QUIC DEMUX: Ensure time field is always initialised

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20451)
---

diff --git a/ssl/quic/quic_demux.c b/ssl/quic/quic_demux.c
index fabbf6cb7ee..94e4a3e27a5 100644
--- a/ssl/quic/quic_demux.c
+++ b/ssl/quic/quic_demux.c
@@ -600,6 +600,9 @@ int ossl_quic_demux_inject(QUIC_DEMUX *demux,
     else
         BIO_ADDR_clear(&urxe->local);
 
+    urxe->time
+        = demux->now != NULL ? demux->now(demux->now_arg) : ossl_time_zero();
+
     /* Move from free list to pending list. */
     ossl_list_urxe_remove(&demux->urx_free, urxe);
     ossl_list_urxe_insert_tail(&demux->urx_pending, urxe);