diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-03-02 20:55:38 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-03-02 20:55:38 +0100 |
| commit | d4a144fadf89bca681724c6c9a65b4a165fa0f90 (patch) | |
| tree | f3b90b45181a5af8bb14856025edb9a3989f82c4 /src/libsystemd/sd-daemon | |
| parent | c98a38ba0bbb7d64a9f4237157f2a08bb85615f6 (diff) | |
sd-daemon: replace VLA with alloca(), to make llvm happy
https://bugs.freedesktop.org/show_bug.cgi?id=89379
Diffstat (limited to 'src/libsystemd/sd-daemon')
| -rw-r--r-- | src/libsystemd/sd-daemon/sd-daemon.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c index c9e2f2dba..0842aba9c 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -350,11 +350,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char .msg_iovlen = 1, .msg_name = &sockaddr, }; - union { - struct cmsghdr cmsghdr; - uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) + - CMSG_SPACE(sizeof(int) * n_fds)]; - } control; + struct cmsghdr *control; _cleanup_close_ int fd = -1; struct cmsghdr *cmsg = NULL; const char *e; @@ -398,8 +394,10 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char if (msghdr.msg_namelen > sizeof(struct sockaddr_un)) msghdr.msg_namelen = sizeof(struct sockaddr_un); + control = alloca(CMSG_SPACE(sizeof(struct ucred)) + CMSG_SPACE(sizeof(int) * n_fds)); + if (n_fds > 0) { - msghdr.msg_control = &control; + msghdr.msg_control = control; msghdr.msg_controllen = CMSG_LEN(sizeof(int) * n_fds); cmsg = CMSG_FIRSTHDR(&msghdr); @@ -416,7 +414,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char try_without_ucred = true; controllen_without_ucred = msghdr.msg_controllen; - msghdr.msg_control = &control; + msghdr.msg_control = control; msghdr.msg_controllen += CMSG_LEN(sizeof(struct ucred)); if (cmsg) |