upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-05-26 19:22:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

BUG/MINOR: uri-auth: avoid leaks on initialization error

Browse source 
When stats_add_scope() and stats_add_auth() fail to initialize a field,
they just leave a partially allocated and initialized structure behind
them that is leaked. The whole architecture doesn't provide clean
unrolling abilities since everything is shared and assigned unconditionally,
but let's at least release what was just allocated. The whole approach would
probably deserve being revisited if one day this becomes more dynamic.

No backport needed.
This commit is contained in:
Willy Tarreau 2026-05-11 15:23:18 +02:00
parent fdfecc5589
commit 2dfbc311a8
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/uri_auth.c
View file

@ -215,8 +215,8 @@ struct uri_auth *stats_set_flag(struct uri_auth **root, int flag)
*/
struct uri_auth *stats_add_auth(struct uri_auth **root, char *user)
{
struct uri_auth *u;
struct auth_users *newuser;
struct uri_auth *u, *old_u;
struct auth_users *newuser = NULL;
char *pass;
pass = strchr(user, ':');
@ -225,20 +225,21 @@ struct uri_auth *stats_add_auth(struct uri_auth **root, char *user)
else
pass = "";
old_u = root ? *root : NULL;
if ((u = stats_check_init_uri_auth(root)) == NULL)
return NULL;
goto fail;
if (!u->userlist)
u->userlist = calloc(1, sizeof(*u->userlist));
if (!u->userlist)
return NULL;
goto fail;
if (!u->userlist->name)
u->userlist->name = strdup(".internal-stats-userlist");
if (!u->userlist->name)
return NULL;
goto fail;
for (newuser = u->userlist->users; newuser; newuser = newuser->next)
if (strcmp(newuser->user, user) == 0) {
@ -249,26 +250,34 @@ struct uri_auth *stats_add_auth(struct uri_auth **root, char *user)
newuser = calloc(1, sizeof(*newuser));
if (!newuser)
return NULL;
goto fail;
newuser->user = strdup(user);
if (!newuser->user) {
free(newuser);
return NULL;
}
if (!newuser->user)
goto fail;
newuser->pass = strdup(pass);
if (!newuser->pass) {
free(newuser->user);
free(newuser);
return NULL;
}
if (!newuser->pass)
goto fail;
newuser->flags |= AU_O_INSECURE;
newuser->next = u->userlist->users;
u->userlist->users = newuser;
return u;
fail:
if (newuser) {
free(newuser->user);
free(newuser);
}
if (!old_u) {
if (u->userlist) {
free(u->userlist->name);
free(u->userlist);
}
free(u);
*root = NULL;
}
return NULL;
}
/*
@ -278,10 +287,11 @@ struct uri_auth *stats_add_auth(struct uri_auth **root, char *user)
*/
struct uri_auth *stats_add_scope(struct uri_auth **root, char *scope)
{
struct uri_auth *u;
struct uri_auth *u, *old_u;
char *new_name;
struct stat_scope *old_scope, **scope_list;
old_u = root ? *root : NULL;
if ((u = stats_check_init_uri_auth(root)) == NULL)
goto out;
@ -308,7 +318,10 @@ struct uri_auth *stats_add_scope(struct uri_auth **root, char *scope)
out_name:
free(new_name);
out_u:
free(u);
if (!old_u) {
free(u);
*root = NULL;
}
out:
return NULL;
}