From: Willy Tarreau <w@1wt.eu>
Date: Wed, 17 Jun 2015 16:34:14 +0000 (+0200)
Subject: BUG/MINOR: ssl: fix smp_fetch_ssl_fc_session_id
X-Git-Tag: v1.6-dev3~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=745d4127582a8c66e2e8ce35f746a78e867960af;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl: fix smp_fetch_ssl_fc_session_id

Dmitry Sivachenko reported the following build warning using Clang
which is a real bug :

src/ssl_sock.c:4104:44: warning: address of 'smp->data.str.len' will always
      evaluate to 'true' [-Wpointer-bool-conversion]
        if (!smp->data.str.str || !&smp->data.str.len)

The impact is very low however, it will return an empty session_id
instead of no session id when none is found.

The fix should be backported to 1.5.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 133a705e7a..dcbef4c574 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -4101,7 +4101,7 @@ smp_fetch_ssl_fc_session_id(const struct arg *args, struct sample *smp, const ch
 		return 0;
 
 	smp->data.str.str = (char *)SSL_SESSION_get_id(ssl_sess, (unsigned int *)&smp->data.str.len);
-	if (!smp->data.str.str || !&smp->data.str.len)
+	if (!smp->data.str.str || !smp->data.str.len)
 		return 0;
 
 	return 1;