mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-12 13:11:11 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: bwlim: Set pointers to NULL when memory is released

Browse Source 
Calls to free() are replaced by ha_free(). And otherwise, the pointers are
explicitly set to NULL after a release. There is no issue here but it could
help debugging sessions.
This commit is contained in:
Christopher Faulet 2022-06-24 14:52:18 +02:00
parent d2494e0489
commit f0196f4f71
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/flt_bwlim.c
View File

@ -191,9 +191,10 @@ static void bwlim_deinit(struct proxy *px, struct flt_conf *fconf)
struct bwlim_config *conf = fconf->conf; struct bwlim_config *conf = fconf->conf;
if (conf) { if (conf) {
free(conf->name); ha_free(&conf->name);
release_sample_expr(conf->expr); release_sample_expr(conf->expr);
free(conf); conf->expr = NULL;
ha_free(&fconf->conf);
} }
} }
@ -241,7 +242,7 @@ static int bwlim_check(struct proxy *px, struct flt_conf *fconf)
px->next_stkt_ref = target->proxies_list; px->next_stkt_ref = target->proxies_list;
target->proxies_list = px; target->proxies_list = px;
} }
free(conf->table.n); ha_free(&conf->table.n);
conf->table.t = target; conf->table.t = target;
} }
@ -485,11 +486,16 @@ int check_bwlim_action(struct act_rule *rule, struct proxy *px, char **err)
/* Release memory allocated by "set-bandwidth-limit" action. */ /* Release memory allocated by "set-bandwidth-limit" action. */
static void release_bwlim_action(struct act_rule *rule) static void release_bwlim_action(struct act_rule *rule)
{ {
free(rule->arg.act.p[0]); ha_free(&rule->arg.act.p[0]);
if (rule->arg.act.p[1]) if (rule->arg.act.p[1]) {
release_sample_expr(rule->arg.act.p[1]); release_sample_expr(rule->arg.act.p[1]);
if (rule->arg.act.p[2]) rule->arg.act.p[1] = NULL;
}
if (rule->arg.act.p[2]) {
release_sample_expr(rule->arg.act.p[2]); release_sample_expr(rule->arg.act.p[2]);
rule->arg.act.p[2] = NULL;
}
rule->arg.act.p[3] = NULL; /* points on the filter's config */
} }
/* Parse "set-bandwidth-limit" action. The filter name must be specified. For /* Parse "set-bandwidth-limit" action. The filter name must be specified. For
@ -798,11 +804,13 @@ static int parse_bwlim_flt(char **args, int *cur_arg, struct proxy *px, struct f
error: error:
if (conf->name) if (conf->name)
free(conf->name); ha_free(&conf->name);
if (conf->expr) if (conf->expr) {
release_sample_expr(conf->expr); release_sample_expr(conf->expr);
conf->expr = NULL;
}
if (conf->table.n) if (conf->table.n)
free(conf->table.n); ha_free(&conf->table.n);
free(conf); free(conf);
return -1; return -1;
} }