From 54b8a825f4102bd56188c48ed0bea8713d7b3955 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Tue, 7 Dec 2021 18:49:44 +0100 Subject: [PATCH] BUG/MINOR: cli/server: Don't crash when a server is added with a custom id When a server is dynamically added via the CLI with a custom id, the key used to insert it in the backend's tree of used names is not initialized. The server id must be used but it is only used when no custom id is provided. Thus, with a custom id, HAProxy crashes. Now, the server id is always used to init this key, to be able to insert the server in the corresponding tree. This patch should fix the issue #1481. It must be backported as far as 2.4. (cherry picked from commit 70f8948364524b83f4763f02ceea884019451e06) Signed-off-by: Christopher Faulet --- src/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server.c b/src/server.c index 47bd38b..4f75dff 100644 --- a/src/server.c +++ b/src/server.c @@ -4829,8 +4829,8 @@ static int cli_parse_add_server(char **args, char *payload, struct appctx *appct } srv->conf.id.key = srv->puid = next_id; - srv->conf.name.key = srv->id; } + srv->conf.name.key = srv->id; /* insert the server in the backend trees */ eb32_insert(&be->conf.used_server_id, &srv->conf.id); -- 1.7.10.4