From: Willy Tarreau <w@1wt.eu>
Date: Mon, 15 Oct 2018 11:20:07 +0000 (+0200)
Subject: BUILD: ssl: fix another null-deref warning in ssl_sock_switchctx_cbk()
X-Git-Tag: v1.9-dev4~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8825520b785d592467c45e183ad8213cb7bf891;p=thirdparty%2Fhaproxy.git

BUILD: ssl: fix another null-deref warning in ssl_sock_switchctx_cbk()

This null-deref cannot happen either as there necesarily is a listener
where this function is called. Let's use __objt_listener() to address
this.

This may be backported to 1.8.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index baedc33c48..41833768d8 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -2127,7 +2127,7 @@ static int ssl_sock_switchctx_cbk(SSL *ssl, int *al, void *arg)
 	int i;
 
 	conn = SSL_get_ex_data(ssl, ssl_app_data_index);
-	s = objt_listener(conn->target)->bind_conf;
+	s = __objt_listener(conn->target)->bind_conf;
 
 	if (s->ssl_conf.early_data)
 		allow_early = 1;