From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Wed, 21 Apr 2021 09:50:26 +0000 (+0200)
Subject: BUG/MINOR: server: fix potential null gcc error in delete server
X-Git-Tag: v2.4-dev17~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6b4b6da3f08ecb3df633aea5d5d9f072ad52135;p=thirdparty%2Fhaproxy.git

BUG/MINOR: server: fix potential null gcc error in delete server

gcc still reports a potential null pointer dereference in delete server
function event with a BUG_ON before it. Remove the misleading NULL check
in the for loop which should never happen.

This does not need to be backported.
---

diff --git a/src/server.c b/src/server.c
index a6c67a01eb..6728e11186 100644
--- a/src/server.c
+++ b/src/server.c
@@ -4563,12 +4563,12 @@ static int cli_parse_delete_server(char **args, char *payload, struct appctx *ap
 	}
 	else {
 		struct server *next;
-		for (next = be->srv; next && srv != next->next; next = next->next)
-			;
+		for (next = be->srv; srv != next->next; next = next->next) {
+			/* srv cannot be not found since we have already found
+			 * it with get_backend_server */
+			BUG_ON(!next);
+		}
 
-		/* srv cannot be not found since we have already found it
-		 * with get_backend_server */
-		BUG_ON(!next);
 		next->next = srv->next;
 	}