]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tree-wide: use strndupa_safe() in a couple more cases
authorFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 25 Dec 2023 12:13:17 +0000 (13:13 +0100)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 25 Dec 2023 17:26:59 +0000 (18:26 +0100)
src/core/dbus-execute.c
src/udev/udev-builtin-path_id.c

index 2c6dce0a0882b1c0a30706ed812be46b11ac495b..1830d697848bbc5e9da3e1c0932bbb4b1cb8aa11 100644 (file)
@@ -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)
index 467c9a6ad3981ece6d1d8c4ae09ddd1362d18cec..f1370e60608ceff37b35aa574a6be0c480e2f52a 100644 (file)
@@ -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)