RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-07 03:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: vars: segfault during the configuration parsing

Browse Source 
This bug is introduced by the patch 48a9cd104d
"MINOR: vars: reduce the code size of some wrappers". A dereferencement was
removed.
This commit is contained in:
Thierry FOURNIER 2015-08-17 18:38:24 +02:00 committed by Willy Tarreau
parent 93c20623db
commit 6f82b6dc35
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/vars.c
View File

@ -607,9 +607,9 @@ static int parse_tcp_req_store(const char **args, int *arg, struct proxy *px,
struct tcp_rule *rule, char **err)
{
if (!parse_vars(args, arg, px, SMP_VAL_FE_REQ_CNT, err,
(struct sample_expr **)rule->act_prm.data[0],
(char **)rule->act_prm.data[1],
(enum vars_scope *)rule->act_prm.data[2]))
(struct sample_expr **)&rule->act_prm.data[0],
(char **)&rule->act_prm.data[1],
(enum vars_scope *)&rule->act_prm.data[2]))
return 0;
rule->action = TCP_ACT_CUSTOM_CONT;
rule->action_ptr = action_tcp_req_store;
@ -621,9 +621,9 @@ static int parse_tcp_res_store(const char **args, int *arg, struct proxy *px,
struct tcp_rule *rule, char **err)
{
if (!parse_vars(args, arg, px, SMP_VAL_BE_RES_CNT, err,
(struct sample_expr **)rule->act_prm.data[0],
(char **)rule->act_prm.data[1],
(enum vars_scope *)rule->act_prm.data[2]))
(struct sample_expr **)&rule->act_prm.data[0],
(char **)&rule->act_prm.data[1],
(enum vars_scope *)&rule->act_prm.data[2]))
return 0;
rule->action = TCP_ACT_CUSTOM_CONT;
rule->action_ptr = action_tcp_res_store;
@ -635,9 +635,9 @@ static int parse_http_req_store(const char **args, int *arg, struct proxy *px,
struct http_req_rule *rule, char **err)
{
if (!parse_vars(args, arg, px, SMP_VAL_FE_HRQ_HDR, err,
(struct sample_expr **)rule->arg.act.p[0],
(char **)rule->arg.act.p[1],
(enum vars_scope *)rule->arg.act.p[2]))
(struct sample_expr **)&rule->arg.act.p[0],
(char **)&rule->arg.act.p[1],
(enum vars_scope *)&rule->arg.act.p[2]))
return -1;
rule->action = HTTP_REQ_ACT_CUSTOM_CONT;
rule->action_ptr = action_http_req_store;
@ -649,9 +649,9 @@ static int parse_http_res_store(const char **args, int *arg, struct proxy *px,
struct http_res_rule *rule, char **err)
{
if (!parse_vars(args, arg, px, SMP_VAL_BE_HRS_HDR, err,
(struct sample_expr **)rule->arg.act.p[0],
(char **)rule->arg.act.p[1],
(enum vars_scope *)rule->arg.act.p[2]))
(struct sample_expr **)&rule->arg.act.p[0],
(char **)&rule->arg.act.p[1],
(enum vars_scope *)&rule->arg.act.p[2]))
return -1;
rule->action = HTTP_RES_ACT_CUSTOM_CONT;
rule->action_ptr = action_http_res_store;