Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid possible leaks in readConfig() #128

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Avoid possible leaks in readConfig() #128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08a5ab3
alternatives: ensure the current group is freed
dtardon May 21, 2024
4334292
alternatives: ensure the current alt. is freed if parsing fails
dtardon May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 59 additions & 28 deletions alternatives.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,31 @@ static int usage(int rc) {
exit(rc);
}

void clearLinkSet(struct linkSet *ls) {
if (!ls)
return;

free(ls->title);
free(ls->facility);
free(ls->target);
}

void clearAlternative(struct alternative *alt) {
int i;

if (!alt)
return;

clearLinkSet(&alt->leader);

for (i = 0; i < alt->numFollowers; i++)
clearLinkSet(&alt->followers[i]);
free(alt->followers);

free(alt->initscript);
free(alt->family);
}

/*
* Function to clean path form unnecessary backslashes
* It will make from //abcd///efgh/ -> /abcd/efgh/
Expand Down Expand Up @@ -291,9 +316,10 @@ static int readConfig(struct alternativeSet *set, const char *title,
struct {
char *facility;
char *title;
} *groups = NULL;
} *groups = NULL, newGroup = {};
int numGroups = 0;
char linkBuf[PATH_MAX];
struct alternative newAlt = {};
int r = 0;

set->alts = NULL;
Expand Down Expand Up @@ -364,8 +390,7 @@ static int readConfig(struct alternativeSet *set, const char *title,
goto finish;
}

groups = realloc(groups, sizeof(*groups) * (numGroups + 1));
groups[numGroups].title = strsteal(&line);
newGroup.title = strsteal(&line);

nextLine(&buf, &line);
if (!line || !*line) {
Expand All @@ -374,7 +399,11 @@ static int readConfig(struct alternativeSet *set, const char *title,
goto finish;
}

groups[numGroups++].facility = strsteal(&line);
newGroup.facility = strsteal(&line);

groups = realloc(groups, sizeof(*groups) * (numGroups + 1));
groups[numGroups++] = newGroup;
newGroup.title = newGroup.facility = NULL;

nextLine(&buf, &line);
}
Expand All @@ -387,28 +416,25 @@ static int readConfig(struct alternativeSet *set, const char *title,

nextLine(&buf, &line);
while (line && *line) {
set->alts = realloc(set->alts, (set->numAlts + 1) * sizeof(*set->alts));

if (*line != '/') {
fprintf(stderr, _("path to alternate expected in %s\n"), path);
fprintf(stderr, _("unexpected line in %s: %s\n"), path, line);
r = 1;
goto finish;
}

set->alts[set->numAlts].leader.facility = normalize_path_alloc(groups[0].facility);
set->alts[set->numAlts].leader.title = strdup(groups[0].title);
set->alts[set->numAlts].leader.target = strsteal(&line);
set->alts[set->numAlts].numFollowers = numGroups - 1;
newAlt.leader.facility = normalize_path_alloc(groups[0].facility);
newAlt.leader.title = strdup(groups[0].title);
newAlt.leader.target = strsteal(&line);
newAlt.numFollowers = numGroups - 1;
if (numGroups > 1)
set->alts[set->numAlts].followers = malloc(
(numGroups - 1) * sizeof(*set->alts[set->numAlts].followers));
newAlt.followers = malloc((numGroups - 1) * sizeof(*newAlt.followers));
else
set->alts[set->numAlts].followers = NULL;
newAlt.followers = NULL;

set->alts[set->numAlts].priority = -1;
set->alts[set->numAlts].initscript = NULL;
set->alts[set->numAlts].family = NULL;
newAlt.priority = -1;
newAlt.initscript = NULL;
newAlt.family = NULL;

nextLine(&buf, &line);
ptr = line;
Expand All @@ -425,11 +451,11 @@ static int readConfig(struct alternativeSet *set, const char *title,
goto finish;
}
*end = '\0';
set->alts[set->numAlts].family = strdup(ptr);
newAlt.family = strdup(ptr);
ptr = end + 1;
}

set->alts[set->numAlts].priority = strtol(ptr, &end, 0);
newAlt.priority = strtol(ptr, &end, 0);

if (!end || (end == ptr)) {
fprintf(stderr, _("numeric priority expected in %s\n"), path);
Expand All @@ -441,13 +467,10 @@ static int readConfig(struct alternativeSet *set, const char *title,
while (*end && isspace(*end))
end++;
if (strlen(end)) {
set->alts[set->numAlts].initscript = strdup(end);
newAlt.initscript = strdup(end);
}
}

if (set->alts[set->numAlts].priority > set->alts[set->best].priority)
set->best = set->numAlts;

for (i = 1; i < numGroups; i++) {
nextLine(&buf, &line);
if (line && strlen(line) && *line != '/') {
Expand All @@ -457,16 +480,21 @@ static int readConfig(struct alternativeSet *set, const char *title,
goto finish;
}

set->alts[set->numAlts].followers[i - 1].title =
strdup(groups[i].title);
set->alts[set->numAlts].followers[i - 1].facility =
normalize_path_alloc(groups[i].facility);
set->alts[set->numAlts].followers[i - 1].target =
(line && strlen(line)) ? strsteal(&line) : NULL;
newAlt.followers[i - 1].title = strdup(groups[i].title);
newAlt.followers[i - 1].facility = normalize_path_alloc(groups[i].facility);
newAlt.followers[i - 1].target = (line && strlen(line)) ? strsteal(&line) : NULL;
}

set->alts = realloc(set->alts, (set->numAlts + 1) * sizeof(*set->alts));
set->alts[set->numAlts] = newAlt;

if (newAlt.priority > set->alts[set->best].priority)
set->best = set->numAlts;
dtardon marked this conversation as resolved.
Show resolved Hide resolved

set->numAlts++;

memset(&newAlt, 0, sizeof(struct alternative));

nextLine(&buf, &line);
}

Expand Down Expand Up @@ -517,7 +545,10 @@ static int readConfig(struct alternativeSet *set, const char *title,
free(groups[i].facility);
}
free(groups);
free(newGroup.title);
free(newGroup.facility);
free(line);
clearAlternative(&newAlt);
return r;
}

Expand Down