From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 29 Jul 2021 15:22:03 +0000 (+0200)
Subject: main: fix type confusion in do_reexecute()
X-Git-Tag: v250-rc1~901
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19fd72df5bcf70c083b07e444976931149432a73;p=thirdparty%2Fsystemd.git

main: fix type confusion in do_reexecute()

Let's use size_t for stuff we count in memory. This doesn't matter much,
but is certainly more correct and less eyebrow-raising.

Follow-up for: 846f1da465beda990c1c01346311393f485df467

See: https://github.com/systemd/systemd/pull/20273#discussion_r679250180
---

diff --git a/src/core/main.c b/src/core/main.c
index f3272a27370..8920d70d5d7 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1721,9 +1721,14 @@ static void update_numa_policy(bool skip_setup) {
                 log_warning_errno(r, "Failed to set NUMA memory policy: %m");
 }
 
-static void filter_args(const char* dst[], unsigned *pos, char **src, int argc) {
+static void filter_args(
+                const char* dst[],
+                size_t *dst_index,
+                char **src,
+                int argc) {
+
         assert(dst);
-        assert(pos);
+        assert(dst_index);
 
         /* Copy some filtered arguments into the dst array from src. */
         for (int i = 1; i < argc; i++) {
@@ -1757,8 +1762,7 @@ static void filter_args(const char* dst[], unsigned *pos, char **src, int argc)
                         continue;
 
                 /* Seems we have a good old option. Let's pass it over to the new instance. */
-                dst[*pos] = src[i];
-                (*pos)++;
+                dst[(*dst_index)++] = src[i];
         }
 }
 
@@ -1772,10 +1776,11 @@ static void do_reexecute(
                 const char *switch_root_init,
                 const char **ret_error_message) {
 
-        unsigned i, args_size;
+        size_t i, args_size;
         const char **args;
         int r;
 
+        assert(argc >= 0);
         assert(saved_rlimit_nofile);
         assert(saved_rlimit_memlock);
         assert(ret_error_message);