From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 30 Nov 2022 00:26:13 +0000 (+0900)
Subject: mkfs-util: fix memleak
X-Git-Tag: v253-rc1~417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3c8cb27b1109bf45e7e70e7e5cc2469afc34f3f;p=thirdparty%2Fsystemd.git

mkfs-util: fix memleak

Fixes an issure introduced by c75cf0164cbd69104f13cbe7be42ab639953bd7d.

Fixes CID#1501073.
---

diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c
index 3edeaa52858..68e8f12eabb 100644
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@ -164,7 +164,9 @@ static int do_mcopy(const char *node, const char *root) {
                 return log_error_errno(r, "Failed to read '%s' contents: %m", root);
 
         for (size_t i = 0; i < de->n_entries; i++) {
-                char *p = path_join(root, de->entries[i]->d_name);
+                _cleanup_free_ char *p = NULL;
+
+                p = path_join(root, de->entries[i]->d_name);
                 if (!p)
                         return log_oom();