From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 25 Dec 2023 12:13:17 +0000 (+0100)
Subject: tree-wide: use strndupa_safe() in a couple more cases
X-Git-Tag: v256-rc1~1384^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78bc04cf121f8affa6edd40d5fe388a467f3819c;p=thirdparty%2Fsystemd.git

tree-wide: use strndupa_safe() in a couple more cases
---

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 2c6dce0a088..1830d697848 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -1311,7 +1311,7 @@ int bus_set_transient_exec_command(
         int r;
 
         /* Drop Ex from the written setting. E.g. ExecStart=, not ExecStartEx=. */
-        const char *written_name = is_ex_prop ? strndupa(name, strlen(name) - 2) : name;
+        const char *written_name = is_ex_prop ? strndupa_safe(name, strlen(name) - 2) : name;
 
         r = sd_bus_message_enter_container(message, 'a', is_ex_prop ? "(sasas)" : "(sasb)");
         if (r < 0)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 467c9a6ad39..f1370e60608 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -632,7 +632,7 @@ static int find_real_nvme_parent(sd_device *dev, sd_device **ret) {
                 return -ENXIO;
 
         end += strspn(end, DIGITS);
-        sysname = strndupa(sysname, end - sysname);
+        sysname = strndupa_safe(sysname, end - sysname);
 
         r = sd_device_new_from_subsystem_sysname(&nvme, "nvme", sysname);
         if (r < 0)