From d04a2a665496a6ebd831118337f182badb28ddcf Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 5 Mar 2020 16:26:12 +0100 Subject: [PATCH] BUG/MINOR: ssl-sock: do not return an uninitialized pointer in ckch_inst_sni_ctx_to_sni_filters There's a build error reported here: https://github.com/haproxy/haproxy/commit/c9c6cdbf9c0e61ee88d68960a3220a4fcbf912cd/checks?check_suite_id=501365673 It's just caused by an inconditional assignment of tmp_filter to *sni_filter without having been initialized, though it's harmless because this return pointer is not used when fcount is NULL, which is the only case where this happens. No backport is needed as this was brought today by commit 38df1c8006 ("MINOR: ssl/cli: support crt-list filters"). --- src/ssl_sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ssl_sock.c b/src/ssl_sock.c index df15b77..eeae7c4 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -3960,8 +3960,8 @@ static int ckch_inst_sni_ctx_to_sni_filters(const struct ckch_inst *ckchi, char memcpy(tmp_filter[i] + sc0->neg + sc0->wild, (char *)sc0->name.key, len + 1); i++; } -end: *sni_filter = tmp_filter; +end: *fcount = tmp_fcount; return errcode; -- 1.7.10.4