From: David Tardon <dtardon@redhat.com>
Date: Tue, 28 Mar 2023 09:22:35 +0000 (+0200)
Subject: execute: use more automatic cleanup
X-Git-Tag: v254-rc1~752^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93404d340e47ce8538a9cdf7d624cfe8df2b5824;p=thirdparty%2Fsystemd.git

execute: use more automatic cleanup
---

diff --git a/src/core/execute.c b/src/core/execute.c
index 2ec666f9615..1328a29b3eb 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -3478,21 +3478,19 @@ static int compile_bind_mounts(
 
         for (size_t i = 0; i < context->n_bind_mounts; i++) {
                 BindMount *item = context->bind_mounts + i;
-                char *s, *d;
+                _cleanup_free_ char *s = NULL, *d = NULL;
 
                 s = strdup(item->source);
                 if (!s)
                         return -ENOMEM;
 
                 d = strdup(item->destination);
-                if (!d) {
-                        free(s);
+                if (!d)
                         return -ENOMEM;
-                }
 
                 bind_mounts[h++] = (BindMount) {
-                        .source = s,
-                        .destination = d,
+                        .source = TAKE_PTR(s),
+                        .destination = TAKE_PTR(d),
                         .read_only = item->read_only,
                         .recursive = item->recursive,
                         .ignore_enoent = item->ignore_enoent,
@@ -3524,7 +3522,7 @@ static int compile_bind_mounts(
                 }
 
                 for (size_t i = 0; i < context->directories[t].n_items; i++) {
-                        char *s, *d;
+                        _cleanup_free_ char *s = NULL, *d = NULL;
 
                         /* When one of the parent directories is in the list, we cannot create the symlink
                          * for the child directory. See also the comments in setup_exec_directory(). */
@@ -3546,14 +3544,12 @@ static int compile_bind_mounts(
                                 d = path_join(params->prefix[t], context->directories[t].items[i].path);
                         else
                                 d = strdup(s);
-                        if (!d) {
-                                free(s);
+                        if (!d)
                                 return -ENOMEM;
-                        }
 
                         bind_mounts[h++] = (BindMount) {
-                                .source = s,
-                                .destination = d,
+                                .source = TAKE_PTR(s),
+                                .destination = TAKE_PTR(d),
                                 .read_only = false,
                                 .nosuid = context->dynamic_user, /* don't allow suid/sgid when DynamicUser= is on */
                                 .recursive = true,