From a44008b25acde42762a40ac1826f968ef289270c Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 30 Dec 2015 15:25:52 +0000 Subject: [PATCH] Check that we have names for both templates and conditions git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722351 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy_hcheck.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c index 1fea0ee008..634577df78 100644 --- a/modules/proxy/mod_proxy_hcheck.c +++ b/modules/proxy/mod_proxy_hcheck.c @@ -182,7 +182,7 @@ static const char *set_hc_condition(cmd_parms *cmd, void *dummy, const char *arg name = ap_getword_conf(cmd->temp_pool, &arg); if (!*name) { - return apr_pstrcat(cmd->temp_pool, "Missing name for ", + return apr_pstrcat(cmd->temp_pool, "Missing condition name for ", cmd->cmd->name, NULL); } /* get expr. Allow fancy new {...} quoting style */ @@ -222,9 +222,15 @@ static const char *set_hc_template(cmd_parms *cmd, void *dummy, const char *arg) ctx = (sctx_t *) ap_get_module_config(cmd->server->module_config, &proxy_hcheck_module); + name = ap_getword_conf(cmd->temp_pool, &arg); + if (!*name) { + return apr_pstrcat(cmd->temp_pool, "Missing template name for ", + cmd->cmd->name, NULL); + } + template = (hc_template_t *)apr_array_push(ctx->templates); - template->name = apr_pstrdup(ctx->p, ap_getword_conf(cmd->temp_pool, &arg)); + template->name = apr_pstrdup(ctx->p, name); template->method = template->passes = template->fails = 1; template->interval = apr_time_from_sec(HCHECK_WATHCHDOG_SEC); template->hurl = NULL; -- 2.49.0