From: Willy Tarreau <w@1wt.eu>
Date: Sat, 13 Mar 2021 11:25:43 +0000 (+0100)
Subject: BUG/MEDIUM: cli: fix "help" crashing since recent spelling fixes
X-Git-Tag: v2.4-dev13~40
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=9c18747823870729fa1dc9c3a77fafe1bc2bfb01;p=haproxy-2.5.git

BUG/MEDIUM: cli: fix "help" crashing since recent spelling fixes

I somehow managed to re-break the "help" command in b736458bf ("MEDIUM:
cli: apply spelling fixes for known commands before listing them")
after fixing it once. A null-deref happens when checking the args
early in the processing.

No backport is needed as this was introduced in 2.4-dev12.
---

diff --git a/src/cli.c b/src/cli.c
index 5ea040e..cfe14d6 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -140,7 +140,7 @@ static char *cli_gen_usage_msg(struct appctx *appctx, char * const *args)
 	/* In case of partial match we'll look for the best matching entries
 	 * starting from position <length>
 	 */
-	if (args[length] && *args[length]) {
+	if (args && args[length] && *args[length]) {
 		list_for_each_entry(kw_list, &cli_keywords.list, list) {
 			for (kw = &kw_list->kw[0]; kw->str_kw[0]; kw++) {
 				if (kw->level & ~appctx->cli_level & (ACCESS_MASTER_ONLY|ACCESS_EXPERT))