From bfbf5f7408b3ded4f50012184d408f4395a577ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 16 Jul 2019 17:16:42 +0200 Subject: [PATCH] firstboot: use free_and_strdup, free_and_replace --- src/firstboot/firstboot.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 74b83f348b8..dca3a25e34a 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -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); } } -- 2.47.3