RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-11 04:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: resolvers: handle a possible strdup() failure

Browse Source 
This defect was found by the coccinelle script "unchecked-strdup.cocci".
It can be backported to all supported branches.
This commit is contained in:
Ilia Shipitsin 2024-12-03 19:54:46 +01:00 committed by Willy Tarreau
parent ce30bc1730
commit 193c94a539
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/resolvers.c
View File

@ -3489,13 +3489,17 @@ static int resolvers_new(struct resolvers **resolvers, const char *id, const cha
p = calloc(1, sizeof *p); p = calloc(1, sizeof *p);
if (!p) { if (!p) {
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto err_free_r;
} }
init_new_proxy(p); init_new_proxy(p);
resolvers_setup_proxy(p); resolvers_setup_proxy(p);
p->parent = r; p->parent = r;
p->id = strdup(id); p->id = strdup(id);
if (!p->id) {
err_code |= ERR_ALERT | ERR_FATAL;
goto err_free_p;
}
p->conf.args.file = p->conf.file = copy_file_name(file); p->conf.args.file = p->conf.file = copy_file_name(file);
p->conf.args.line = p->conf.line = linenum; p->conf.args.line = p->conf.line = linenum;
r->px = p; r->px = p;
@ -3503,8 +3507,16 @@ static int resolvers_new(struct resolvers **resolvers, const char *id, const cha
/* default values */ /* default values */
LIST_APPEND(&sec_resolvers, &r->list); LIST_APPEND(&sec_resolvers, &r->list);
r->conf.file = strdup(file); r->conf.file = strdup(file);
if (!r->conf.file) {
err_code |= ERR_ALERT | ERR_FATAL;
goto err_free_p_id;
}
r->conf.line = linenum; r->conf.line = linenum;
r->id = strdup(id); r->id = strdup(id);
if (!r->id) {
err_code |= ERR_ALERT | ERR_FATAL;
goto err_free_conf_file;
}
r->query_ids = EB_ROOT; r->query_ids = EB_ROOT;
/* default maximum response size */ /* default maximum response size */
r->accepted_payload_size = 512; r->accepted_payload_size = 512;
@ -3528,11 +3540,17 @@ static int resolvers_new(struct resolvers **resolvers, const char *id, const cha
*resolvers = r; *resolvers = r;
out: out:
if (err_code & (ERR_FATAL|ERR_ABORT)) { return err_code;
ha_free(&r);
ha_free(&p);
}
/* free all allocated stuff and return err_code */
err_free_conf_file:
ha_free((void **)&r->conf.file);
err_free_p_id:
ha_free(&p->id);
err_free_p:
ha_free(&p);
err_free_r:
ha_free(&r);
return err_code; return err_code;
} }