From: Willy Tarreau <w@1wt.eu>
Date: Thu, 28 Jan 2010 21:31:02 +0000 (+0100)
Subject: [CLEANUP] config: do not allocate an empty argument for rsp* keywords
X-Git-Tag: v1.3.23~1
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=f33e55af06460196deef7bbe0dc164df1418d091;p=haproxy.git

[CLEANUP] config: do not allocate an empty argument for rsp* keywords

This was a harmless copy-paste typo. Empty parameters are strduped
and passed to chain_regex(). This was spotted and fixed in 1.4
commit ade5ec430d01b4ba06fd67a63fcee85fea46ba28.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 1c1452dd8..84d2797b2 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -3405,7 +3405,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
 			goto out;
 		}
 	
-		err = chain_regex(&curproxy->rsp_exp, preg, ACT_REMOVE, strdup(args[2]));
+		err = chain_regex(&curproxy->rsp_exp, preg, ACT_REMOVE, NULL);
 		if (err) {
 			Alert("parsing [%s:%d] : invalid character or unterminated sequence in replacement string near '%c'.\n",
 			      file, linenum, *err);
@@ -3436,7 +3436,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
 			goto out;
 		}
 	
-		err = chain_regex(&curproxy->rsp_exp, preg, ACT_DENY, strdup(args[2]));
+		err = chain_regex(&curproxy->rsp_exp, preg, ACT_DENY, NULL);
 		if (err) {
 			Alert("parsing [%s:%d] : invalid character or unterminated sequence in replacement string near '%c'.\n",
 			      file, linenum, *err);
@@ -3499,7 +3499,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
 			goto out;
 		}
 	
-		err = chain_regex(&curproxy->rsp_exp, preg, ACT_REMOVE, strdup(args[2]));
+		err = chain_regex(&curproxy->rsp_exp, preg, ACT_REMOVE, NULL);
 		if (err) {
 			Alert("parsing [%s:%d] : invalid character or unterminated sequence in replacement string near '%c'.\n",
 			      file, linenum, *err);
@@ -3530,7 +3530,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int inv)
 			goto out;
 		}
 	
-		err = chain_regex(&curproxy->rsp_exp, preg, ACT_DENY, strdup(args[2]));
+		err = chain_regex(&curproxy->rsp_exp, preg, ACT_DENY, NULL);
 		if (err) {
 			Alert("parsing [%s:%d] : invalid character or unterminated sequence in replacement string near '%c'.\n",
 			      file, linenum, *err);