From 8032a276ce8007020366d18ebd7400ad5dedc4f4 Mon Sep 17 00:00:00 2001 From: Emeric Brun Date: Mon, 22 Aug 2022 10:25:11 +0200 Subject: [PATCH] BUG/MAJOR: mworker: fix infinite loop on master with no proxies. The master is re-exec with an empty proxies list if no master CLI is configured. This results in infinite loop since last patch: 3b68b602 ("BUG/MAJOR: log-forward: Fix log-forward proxies not fully initialized") This patch avoid to loop again on log-forward proxies list if empty. This patch should be backported until v2.3 --- src/cfgparse.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cfgparse.c b/src/cfgparse.c index 989f313a9..4201c1354 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -3906,7 +3906,9 @@ int check_config_validity() */ if (init_proxies_list == proxies_list) { init_proxies_list = cfg_log_forward; - goto init_proxies_list_stage1; + /* check if list is not null to avoid infinite loop */ + if (init_proxies_list) + goto init_proxies_list_stage1; } /***********************************************************/ @@ -4058,7 +4060,9 @@ int check_config_validity() */ if (init_proxies_list == proxies_list) { init_proxies_list = cfg_log_forward; - goto init_proxies_list_stage2; + /* check if list is not null to avoid infinite loop */ + if (init_proxies_list) + goto init_proxies_list_stage2; } if (diag_no_cluster_secret)