From: Willy Tarreau <w@1wt.eu>
Date: Fri, 22 Oct 2010 14:15:31 +0000 (+0200)
Subject: [MINOR] checks: ensure that we can inherit binary checks from the defaults section
X-Git-Tag: v1.5-dev8~434
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa2f389cbb6f4dc5af038ef77335415c6141d2fc;p=thirdparty%2Fhaproxy.git

[MINOR] checks: ensure that we can inherit binary checks from the defaults section

Health checks were all pure ASCII, but we're going to have to support some
binary checks (eg: SQL). When they're inherited from the default section,
they will be truncated to the first \0 due to strdup(). Let's fix that with
a simple malloc.
(cherry picked from commit 98fc04a766bcff80f57db2b1cd865c91761b131b)
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 25e78ad7a0..617bb4113f 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1169,8 +1169,10 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
 			curproxy->fullconn = defproxy.fullconn;
 			curproxy->conn_retries = defproxy.conn_retries;
 
-			if (defproxy.check_req)
-				curproxy->check_req = strdup(defproxy.check_req);
+			if (defproxy.check_req) {
+				curproxy->check_req = calloc(1, defproxy.check_len);
+				memcpy(curproxy->check_req, defproxy.check_req, defproxy.check_len);
+			}
 			curproxy->check_len = defproxy.check_len;
 
 			if (defproxy.cookie_name)