From: Jim Jagielski <jim@apache.org>
Date: Wed, 30 Dec 2015 15:25:52 +0000 (+0000)
Subject: Check that we have names for both templates and
X-Git-Tag: 2.5.0-alpha~2474
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a44008b25acde42762a40ac1826f968ef289270c;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index 1fea0ee0084..634577df780 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;