From: Frédéric Lécaille Date: Thu, 15 Jun 2023 09:02:53 +0000 (+0200) Subject: MINOR: quic: Remove pool_zalloc() from qc_conn_alloc_ssl_ctx() X-Git-Tag: v2.9-dev1~53 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f9bd5f84d6b183cc72dd39ebac4a85594b13c71;p=thirdparty%2Fhaproxy.git MINOR: quic: Remove pool_zalloc() from qc_conn_alloc_ssl_ctx() pool_zalloc() is replaced by pool_alloc() into qc_conn_alloc_ssl_ctx() to allocate a ssl_sock_ctx struct. ssl_sock_ctx struct member are all initiliazed to null values excepted ->ssl which is initialized by the next statement: a call to qc_ssl_sess_init(). --- diff --git a/src/quic_conn.c b/src/quic_conn.c index 93773995f0..9140901d33 100644 --- a/src/quic_conn.c +++ b/src/quic_conn.c @@ -6806,14 +6806,22 @@ static int qc_conn_alloc_ssl_ctx(struct quic_conn *qc) TRACE_ENTER(QUIC_EV_CONN_NEW, qc); - ctx = pool_zalloc(pool_head_quic_conn_ctx); + ctx = pool_alloc(pool_head_quic_conn_ctx); if (!ctx) { TRACE_ERROR("SSL context allocation failed", QUIC_EV_CONN_TXPKT); goto err; } - ctx->subs = NULL; + ctx->conn = NULL; + ctx->bio = NULL; + ctx->xprt = NULL; ctx->xprt_ctx = NULL; + memset(&ctx->wait_event, 0, sizeof(ctx->wait_event)); + ctx->subs = NULL; + ctx->xprt_st = 0; + ctx->error_code = 0; + ctx->early_buf = BUF_NULL; + ctx->sent_early_data = 0; ctx->qc = qc; if (qc_is_listener(qc)) {