]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core/execute-serialize: FOREACH_ARRAY at one more place
authorMike Yuan <me@yhndnzj.com>
Thu, 30 Nov 2023 11:13:12 +0000 (19:13 +0800)
committerMike Yuan <me@yhndnzj.com>
Thu, 30 Nov 2023 16:07:04 +0000 (00:07 +0800)
src/core/execute-serialize.c

index 6c19cd42a2465bdec695d3f9247b6a88e6804191..a874a1eb14f1e5d3b85f8563fdcc2c13287f41c3 100644 (file)
@@ -373,8 +373,7 @@ static int exec_cgroup_context_serialize(const CGroupContext *c, FILE *f) {
                         if (il->limits[type] == cgroup_io_limit_defaults[type])
                                 continue;
 
-                        key = strjoin("exec-cgroup-context-io-device-limit-",
-                                        cgroup_io_limit_type_to_string(type));
+                        key = strjoin("exec-cgroup-context-io-device-limit-", cgroup_io_limit_type_to_string(type));
                         if (!key)
                                 return -ENOMEM;
 
@@ -1479,8 +1478,8 @@ static int exec_parameters_deserialize(ExecParameters *p, FILE *f, FDSet *fds) {
                                 return log_oom_debug();
 
                         /* Ensure we don't leave any FD uninitialized on error, it makes the fuzzer sad */
-                        for (size_t i = 0; i < p->n_socket_fds + p->n_storage_fds; ++i)
-                                p->fds[i] = -EBADF;
+                        FOREACH_ARRAY(i, p->fds, p->n_socket_fds + p->n_storage_fds)
+                                *i = -EBADF;
 
                         r = deserialize_fd_many(fds, val, p->n_socket_fds + p->n_storage_fds, p->fds);
                         if (r < 0)