From b2d3d3e03fe085f1e4af62e32e4629dadeb3d62f Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Fri, 7 Aug 2020 17:59:16 -0400 Subject: [PATCH] Fix strncpy() buffer size compiler warnings --- src/client.c | 2 +- src/kiss.c | 2 +- src/server.c | 6 +++--- src/sock.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client.c b/src/client.c index 30bf029..f1c69e5 100644 --- a/src/client.c +++ b/src/client.c @@ -27,7 +27,7 @@ patty_client *patty_client_new(const char *path) { memset(&addr, '\0', sizeof(addr)); addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, path, sizeof(addr.sun_path)); + strncpy(addr.sun_path, path, sizeof(addr.sun_path)-1); if (connect(client->fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { goto error_connect; diff --git a/src/kiss.c b/src/kiss.c index fb6502b..eed2c46 100644 --- a/src/kiss.c +++ b/src/kiss.c @@ -191,7 +191,7 @@ patty_kiss_tnc *patty_kiss_tnc_new(const char *device) { memset(&addr, '\0', sizeof(addr)); addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, device, sizeof(addr.sun_path)); + strncpy(addr.sun_path, device, sizeof(addr.sun_path)-1); if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { goto error_connect; diff --git a/src/server.c b/src/server.c index cc9102d..9de378b 100644 --- a/src/server.c +++ b/src/server.c @@ -46,7 +46,7 @@ patty_ax25_server *patty_ax25_server_new(const char *path) { memset(server, '\0', sizeof(*server)); - strncpy(server->path, path, PATTY_AX25_SOCK_PATH_SIZE); + strncpy(server->path, path, sizeof(server->path)-1); if ((server->ifaces = patty_list_new()) == NULL) { goto error_list_new_ifaces; @@ -523,7 +523,7 @@ static int respond_accept(int client, } if (path) { - strncpy(response.path, path, sizeof(response.path)); + strncpy(response.path, path, sizeof(response.path)-1); } return write(client, &response, sizeof(response)); @@ -957,7 +957,7 @@ static int listen_unix(patty_ax25_server *server, const char *path) { memset(&addr, '\0', sizeof(addr)); addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, path, sizeof(addr.sun_path)); + strncpy(addr.sun_path, path, sizeof(addr.sun_path)-1); if (bind(server->fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { goto error_bind; diff --git a/src/sock.c b/src/sock.c index da67edf..ea26f63 100644 --- a/src/sock.c +++ b/src/sock.c @@ -30,7 +30,7 @@ static int bind_pty(patty_ax25_sock *sock) { goto error_ptsname; } - (void)strncpy(sock->pty, pty, sizeof(sock->pty)); + (void)strncpy(sock->pty, pty, sizeof(sock->pty)-1); return 0;