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

execute: use CLEANUP_ARRAY
---

diff --git a/src/core/execute.c b/src/core/execute.c
index bfdd2026c67..2ec666f9615 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -3444,7 +3444,7 @@ static int compile_bind_mounts(
                 char ***ret_empty_directories) {
 
         _cleanup_strv_free_ char **empty_directories = NULL;
-        BindMount *bind_mounts;
+        BindMount *bind_mounts = NULL;
         size_t n, h = 0;
         int r;
 
@@ -3454,6 +3454,8 @@ static int compile_bind_mounts(
         assert(ret_n_bind_mounts);
         assert(ret_empty_directories);
 
+        CLEANUP_ARRAY(bind_mounts, h, bind_mount_free_many);
+
         n = context->n_bind_mounts;
         for (ExecDirectoryType t = 0; t < _EXEC_DIRECTORY_TYPE_MAX; t++) {
                 if (!params->prefix[t])
@@ -3479,16 +3481,13 @@ static int compile_bind_mounts(
                 char *s, *d;
 
                 s = strdup(item->source);
-                if (!s) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
+                if (!s)
+                        return -ENOMEM;
 
                 d = strdup(item->destination);
                 if (!d) {
                         free(s);
-                        r = -ENOMEM;
-                        goto finish;
+                        return -ENOMEM;
                 }
 
                 bind_mounts[h++] = (BindMount) {
@@ -3516,14 +3515,12 @@ static int compile_bind_mounts(
                          * tmpfs that makes it accessible and is empty except for the submounts we do this for. */
 
                         private_root = path_join(params->prefix[t], "private");
-                        if (!private_root) {
-                                r = -ENOMEM;
-                                goto finish;
-                        }
+                        if (!private_root)
+                                return -ENOMEM;
 
                         r = strv_consume(&empty_directories, private_root);
                         if (r < 0)
-                                goto finish;
+                                return r;
                 }
 
                 for (size_t i = 0; i < context->directories[t].n_items; i++) {
@@ -3538,10 +3535,8 @@ static int compile_bind_mounts(
                                 s = path_join(params->prefix[t], "private", context->directories[t].items[i].path);
                         else
                                 s = path_join(params->prefix[t], context->directories[t].items[i].path);
-                        if (!s) {
-                                r = -ENOMEM;
-                                goto finish;
-                        }
+                        if (!s)
+                                return -ENOMEM;
 
                         if (exec_directory_is_private(context, t) &&
                             exec_context_with_rootfs(context))
@@ -3553,8 +3548,7 @@ static int compile_bind_mounts(
                                 d = strdup(s);
                         if (!d) {
                                 free(s);
-                                r = -ENOMEM;
-                                goto finish;
+                                return -ENOMEM;
                         }
 
                         bind_mounts[h++] = (BindMount) {
@@ -3570,15 +3564,11 @@ static int compile_bind_mounts(
 
         assert(h == n);
 
-        *ret_bind_mounts = bind_mounts;
+        *ret_bind_mounts = TAKE_PTR(bind_mounts);
         *ret_n_bind_mounts = n;
         *ret_empty_directories = TAKE_PTR(empty_directories);
 
         return (int) n;
-
-finish:
-        bind_mount_free_many(bind_mounts, h);
-        return r;
 }
 
 /* ret_symlinks will contain a list of pairs src:dest that describes