From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 25 Oct 2025 17:18:34 +0000 (+0200)
Subject: core/exec-invoke: use strnpcpy() where appropriate
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a169a952b66a80b47966f0773422b38feecec7b2;p=thirdparty%2Fsystemd.git

core/exec-invoke: use strnpcpy() where appropriate
---

diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
index aaa9a0e8bd9..2448baa125c 100644
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -77,6 +77,7 @@
 #include "stat-util.h"
 #include "string-table.h"
 #include "strv.h"
+#include "strxcpyx.h"
 #include "terminal-util.h"
 #include "user-util.h"
 #include "utmp-wtmp.h"
@@ -1504,7 +1505,7 @@ static void rename_process_from_path(const char *path) {
         size_t len = strlen(buf);
         char comm[TASK_COMM_LEN], *p = comm;
         *p++ = '(';
-        p = mempcpy(p, buf + LESS_BY(len, (size_t) (TASK_COMM_LEN - 3)), MIN(len, (size_t) (TASK_COMM_LEN - 3)));
+        strnpcpy(&p, TASK_COMM_LEN - 2, buf, len); /* strnpcpy() accounts for NUL byte internally */
         *p++ = ')';
         *p = '\0';