sinjuginas/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MINOR: acl: Fix memory leaks when an ACL expression is parsed

Browse Source 
This only happens during the configuration parsing. First leak is the string
representing the last converter parsed, if any. The second one is on the error
path, when the allocation of the ACL expression failed. In this case, the sample
was not released.

This patch fixes the issue #256. It must be backported to all stable versions.
This commit is contained in:
Christopher Faulet 2019-09-13 09:50:15 +02:00
parent 3e395632bf
commit 361935aa1e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/acl.c
View File

@ -342,6 +342,8 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
goto out_free_smp;
}
}
free(ckw);
ckw = NULL;
}
else {
/* This is not an ACL keyword, so we hope this is a sample fetch
@ -360,7 +362,7 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
expr = calloc(1, sizeof(*expr));
if (!expr) {
memprintf(err, "out of memory when parsing ACL expression");
goto out_return;
goto out_free_smp;
}
pattern_init_head(&expr->pat);
@ -678,8 +680,8 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
out_free_expr:
prune_acl_expr(expr);
free(expr);
free(ckw);
out_free_smp:
free(ckw);
free(smp);
out_return:
return NULL;