From 3203ff4617d1180a4899f9b6458e3e66c298f6df Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Sun, 11 Nov 2012 17:30:56 +0100 Subject: [PATCH] MINOR: log-format: check number of arguments in cfgparse.c Exit with error if there is a second argument in the 'log-format' and 'unique-id-format' options. It is convenient when we forgot to escape spaces. --- src/cfgparse.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/cfgparse.c b/src/cfgparse.c index c601cbc8e..6a4e0bb62 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -4702,6 +4702,11 @@ stats_error_parsing: err_code |= ERR_ALERT | ERR_FATAL; goto out; } + if (*(args[2])) { + Alert("parsing [%s:%d] : %s expects only one argument, don't forget to escape spaces!\n", file, linenum, args[0]); + err_code |= ERR_ALERT | ERR_FATAL; + goto out; + } free(curproxy->uniqueid_format_string); curproxy->uniqueid_format_string = strdup(args[1]); } @@ -4722,6 +4727,11 @@ stats_error_parsing: err_code |= ERR_ALERT | ERR_FATAL; goto out; } + if (*(args[2])) { + Alert("parsing [%s:%d] : %s expects only one argument, don't forget to escape spaces!\n", file, linenum, args[0]); + err_code |= ERR_ALERT | ERR_FATAL; + goto out; + } if (curproxy->logformat_string != default_http_log_format && curproxy->logformat_string != default_tcp_log_format &&