From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 16 Jul 2019 15:16:42 +0000 (+0200)
Subject: firstboot: use free_and_strdup, free_and_replace
X-Git-Tag: v243-rc1~96^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfbf5f7408b3ded4f50012184d408f4395a577ca;p=thirdparty%2Fsystemd.git

firstboot: use free_and_strdup, free_and_replace
---

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);
         }
 }