From: Willy Tarreau <w@1wt.eu>
Date: Tue, 12 Feb 2019 09:59:32 +0000 (+0100)
Subject: BUILD/MINOR: stream: avoid a build warning with threads disabled
X-Git-Tag: v2.0-dev1~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ef724e2169eaff7f0272278c3fba9b34d5c7f78;p=thirdparty%2Fhaproxy.git

BUILD/MINOR: stream: avoid a build warning with threads disabled

gcc 6+ complains about a possible null-deref here due to the test in
objt_server() :

       if (objt_server(s->target))
           HA_ATOMIC_ADD(&objt_server(s->target)->counters.retries, 1);

Let's simply change it to __objt_server(). This can be backported to
1.9 and 1.8.
---

diff --git a/src/stream.c b/src/stream.c
index df778b156b..a58c855300 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -793,7 +793,7 @@ static int sess_update_st_cer(struct stream *s)
 		si->state = SI_ST_REQ;
 	} else {
 		if (objt_server(s->target))
-			HA_ATOMIC_ADD(&objt_server(s->target)->counters.retries, 1);
+			HA_ATOMIC_ADD(&__objt_server(s->target)->counters.retries, 1);
 		HA_ATOMIC_ADD(&s->be->be_counters.retries, 1);
 		si->state = SI_ST_ASS;
 	}