From: Willy Tarreau Date: Mon, 15 Oct 2018 09:01:59 +0000 (+0200) Subject: BUILD: ssl: fix null-deref warning in ssl_fc_cipherlist_str sample fetch X-Git-Tag: v1.9-dev4~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b729077710b14c75936909409e27a4fa0badcb54;p=thirdparty%2Fhaproxy.git BUILD: ssl: fix null-deref warning in ssl_fc_cipherlist_str sample fetch Gcc 6.4 detects a potential null-deref warning in smp_fetch_ssl_fc_cl_str(). This one is not real since already addressed a few lines above. Let's use __objt_conn() instead of objt_conn() to avoid the extra test that confuses it. This could be backported to 1.8. --- diff --git a/src/ssl_sock.c b/src/ssl_sock.c index b78dc871b4..baedc33c48 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -7069,7 +7069,7 @@ smp_fetch_ssl_fc_cl_str(const struct arg *args, struct sample *smp, const char * #if defined(OPENSSL_IS_BORINGSSL) cipher = SSL_get_cipher_by_value(id); #else - struct connection *conn = objt_conn(smp->sess->origin); + struct connection *conn = __objt_conn(smp->sess->origin); cipher = SSL_CIPHER_find(conn->xprt_ctx, bin); #endif str = SSL_CIPHER_get_name(cipher);