From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Oct 2018 16:27:33 +0000 (+0200)
Subject: socket-util: tweak commenting in socket_address_get_path()
X-Git-Tag: v240~538^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48e6a2dc8467204f75eef1b29a245ff39e0592ce;p=thirdparty%2Fsystemd.git

socket-util: tweak commenting in socket_address_get_path()

Let's make clear explicitly that there's always a NUL byte following the
path, and how.
---

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 6b3c6592a52..c55f67964ee 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -489,6 +489,10 @@ const char* socket_address_get_path(const SocketAddress *a) {
         if (a->sockaddr.un.sun_path[0] == 0)
                 return NULL;
 
+        /* Note that this is only safe because we know that there's an extra NUL byte after the sockaddr_un
+         * structure. On Linux AF_UNIX file system socket addresses don't have to be NUL terminated if they take up the
+         * full sun_path space. */
+        assert_cc(sizeof(union sockaddr_union) >= sizeof(struct sockaddr_un)+1);
         return a->sockaddr.un.sun_path;
 }