picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

firstboot: use free_and_strdup, free_and_replace

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-07-16 17:16:42 +02:00
parent 476da0fe00
commit bfbf5f7408
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/firstboot/firstboot.c
View file

@ -186,21 +186,15 @@ static int prompt_loop(const char *text, char **l, bool (*is_valid)(const char *
r = safe_atou(p, &u);
if (r >= 0) {
char *c;
if (u <= 0 || u > strv_length(l)) {
log_error("Specified entry number out of range.");
continue;
}
log_info("Selected '%s'.", l[u-1]);
c = strdup(l[u-1]);
if (!c)
if (free_and_strdup(ret, l[u-1]) < 0)
return log_oom();
free(*ret);
*ret = c;
return 0;
}
@ -209,10 +203,7 @@ static int prompt_loop(const char *text, char **l, bool (*is_valid)(const char *
continue;
}
free(*ret);
*ret = p;
p = 0;
return 0;
return free_and_replace(*ret, p);
}
}