Use dm_strncpy instead of plain strncpy while setting the socket path.

Also check the return value as it meaningless to work with truncated strings.

diff --git a/libdaemon/client/daemon-client.c b/libdaemon/client/daemon-client.c
index 136c57d1ab026def56322ad82aaa0ffc9fd7fdaf..906de38c0dd3269369de3cf9a2d5cdcb0c086b86 100644 (file)
--- a/libdaemon/client/daemon-client.c
+++ b/libdaemon/client/daemon-client.c
@@ -32,7 +32,10 @@ daemon_handle daemon_open(daemon_info i) {
                goto error;
 
        memset(&sockaddr, 0, sizeof(sockaddr));
-       strncpy(sockaddr.sun_path, i.socket, sizeof(sockaddr.sun_path));
+       if (!dm_strncpy(sockaddr.sun_path, i.socket, sizeof(sockaddr.sun_path))) {
+               fprintf(stderr, "%s: daemon socket path too long.\n", i.socket);
+               goto error;
+       }
        sockaddr.sun_family = AF_UNIX;
        if (connect(h.socket_fd,(struct sockaddr *) &sockaddr, sizeof(sockaddr)))
                goto error;

diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index ca5a30f3a80fb6bd6a27edb570d41f7793def104..568ef36121d89af54c0d6908a49f8366ee5d32be 100644 (file)
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -224,7 +224,10 @@ static int _open_socket(daemon_state s)
 
        fprintf(stderr, "[D] creating %s\n", s.socket_path);
        memset(&sockaddr, 0, sizeof(sockaddr));
-       strncpy(sockaddr.sun_path, s.socket_path, sizeof(sockaddr.sun_path));
+       if (!dm_strncpy(sockaddr.sun_path, s.socket_path, sizeof(sockaddr.sun_path))) {
+               fprintf(stderr, "%s: daemon socket path too long.\n", s.socket_path);
+               goto error;
+       }
        sockaddr.sun_family = AF_UNIX;
 
        if (bind(fd, (struct sockaddr *) &sockaddr, sizeof(sockaddr))) {