From d6b218e7426ef78e1682959c37b015e6eb692dc5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 14 Feb 2022 17:23:35 +0100 Subject: [PATCH] sd-daemon: use path_join() instead of manual path concat --- src/libsystemd/sd-daemon/sd-daemon.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c index b5f62ec5e87..4987eab9164 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -412,7 +412,7 @@ _public_ int sd_is_mq(int fd, const char *path) { } if (path) { - char fpath[PATH_MAX]; + _cleanup_free_ char *fpath = NULL; struct stat a, b; assert_return(path_is_absolute(path), -EINVAL); @@ -420,8 +420,9 @@ _public_ int sd_is_mq(int fd, const char *path) { if (fstat(fd, &a) < 0) return -errno; - strncpy(stpcpy(fpath, "/dev/mqueue"), path, sizeof(fpath) - 12); - fpath[sizeof(fpath)-1] = 0; + fpath = path_join("/dev/mqueue", path); + if (!fpath) + return -ENOMEM; if (stat(fpath, &b) < 0) return -errno; -- 2.47.3